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

bugfix:单机单进程模式下锁没正确释放

pull/58/head
daxing 2018-02-23 16:06:24 +08:00
parent 8794fd12b9
commit fb673f65e0
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
client.go
View File

@ -86,6 +86,12 @@ func (c *Client) Grant(ttl int64) (*client.LeaseGrantResponse, error) {
return c.Client.Grant(ctx, ttl) return c.Client.Grant(ctx, ttl)
} }
func (c *Client) Revoke(id client.LeaseID) (*client.LeaseRevokeResponse, error) {
ctx, cancel := context.WithTimeout(context.Background(), c.reqTimeout)
defer cancel()
return c.Client.Revoke(ctx, id)
}
func (c *Client) KeepAliveOnce(id client.LeaseID) (*client.LeaseKeepAliveResponse, error) { func (c *Client) KeepAliveOnce(id client.LeaseID) (*client.LeaseKeepAliveResponse, error) {
ctx, cancel := context.WithTimeout(context.Background(), c.reqTimeout) ctx, cancel := context.WithTimeout(context.Background(), c.reqTimeout)
defer cancel() defer cancel()

10
job.go
View File

@ -91,7 +91,6 @@ type locker struct {
kind int kind int
ttl int64 ttl int64
lID client.LeaseID lID client.LeaseID
lKey string
timer *time.Timer timer *time.Timer
done chan struct{} done chan struct{}
} }
@ -121,12 +120,8 @@ func (l *locker) unlock() {
close(l.done) close(l.done)
l.timer.Stop() l.timer.Stop()
if _, err := DefalutClient.KeepAliveOnce(l.lID); err != nil { if _, err := DefalutClient.Revoke(l.lID); err != nil {
log.Warnf("unlock keep alive err: %s", err.Error()) log.Warnf("unlock revoke err: %s", err.Error())
}
err := DefalutClient.DelLock(l.lKey)
if err != nil {
log.Warnf("unlock[%s] err: %s", l.lKey, err.Error())
} }
} }
@ -270,7 +265,6 @@ func (c *Cmd) lock() *locker {
} }
lk.lID = resp.ID lk.lID = resp.ID
lk.lKey = c.Job.ID
if lk.kind == KindAlone { if lk.kind == KindAlone {
go lk.keepAlive() go lk.keepAlive()
} }