From eab9701823145043fc3fd107caec9fb76c57d651 Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Thu, 23 Apr 2020 03:35:52 -0700 Subject: [PATCH] allow lock with an existing lock --- weed/shell/exclusive_locker.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/weed/shell/exclusive_locker.go b/weed/shell/exclusive_locker.go index f4938d3e6..33307785f 100644 --- a/weed/shell/exclusive_locker.go +++ b/weed/shell/exclusive_locker.go @@ -41,7 +41,10 @@ func (l *ExclusiveLocker) RequestLock() { // retry to get the lease for { if err := l.masterClient.WithClient(func(client master_pb.SeaweedClient) error { - resp, err := client.LeaseAdminToken(context.Background(), &master_pb.LeaseAdminTokenRequest{}) + resp, err := client.LeaseAdminToken(context.Background(), &master_pb.LeaseAdminTokenRequest{ + PreviousToken: atomic.LoadInt64(&l.token), + PreviousLockTime: atomic.LoadInt64(&l.lockTsNs), + }) if err == nil { atomic.StoreInt64(&l.token, resp.Token) atomic.StoreInt64(&l.lockTsNs, resp.LockTsNs)