jinql
/
cronsun
mirror of https://github.com/shunfei/cronsun
1
0
Fork 0
Code Issues Releases Wiki Activity

proc: 执行 etcd 命令超时时，有可能已经执行成功

pull/1/head
miraclesu 2017-04-18 17:12:40 +08:00
parent 1cdb750245
commit de9690930f
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
models/proc.go
View File

@ -174,28 +174,31 @@ func (j *Job) CountRunning() (int64, error) {
return resp.Count, nil return resp.Count, nil
} }
func (p *Process) put() error { func (p *Process) put() (err error) {
if atomic.LoadInt32(&p.running) != 1 { if atomic.LoadInt32(&p.running) != 1 {
return nil return
} }
if !atomic.CompareAndSwapInt32(&p.hasPut, 0, 1) { if !atomic.CompareAndSwapInt32(&p.hasPut, 0, 1) {
return nil return
} }
defer func() {
// 如果是超时，值可能已经写入 etcd
if err != nil && !strings.Contains(err.Error(), "deadline") {
atomic.SwapInt32(&p.hasPut, 0)
}
}()
id := lID.get() id := lID.get()
if id < 0 { if id < 0 {
if _, err := DefalutClient.Put(p.Key(), p.Val()); err != nil { if _, err = DefalutClient.Put(p.Key(), p.Val()); err != nil {
atomic.SwapInt32(&p.hasPut, 0) return
return err
} }
} }
_, err := DefalutClient.Put(p.Key(), p.Val(), client.WithLease(id)) _, err = DefalutClient.Put(p.Key(), p.Val(), client.WithLease(id))
if err != nil { return
atomic.SwapInt32(&p.hasPut, 0)
}
return err
} }
func (p *Process) del() error { func (p *Process) del() error {
@ -218,7 +221,7 @@ func (p *Process) Start() {
if conf.Config.ProcReq == 0 { if conf.Config.ProcReq == 0 {
if err := p.put(); err != nil { if err := p.put(); err != nil {
log.Warnf("proc put err: %s", err.Error()) log.Warnf("proc put[%s] err: %s", p.Key(), err.Error())
} }
return return
} }
@ -230,7 +233,7 @@ func (p *Process) Start() {
case <-p.done: case <-p.done:
case <-time.After(time.Duration(conf.Config.ProcReq) * time.Second): case <-time.After(time.Duration(conf.Config.ProcReq) * time.Second):
if err := p.put(); err != nil { if err := p.put(); err != nil {
log.Warnf("proc put err: %s", err.Error()) log.Warnf("proc put[%s] err: %s", p.Key(), err.Error())
} }
} }
p.wg.Done() p.wg.Done()