mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2024-01-19 02:48:24 +00:00
make second lock instant
This commit is contained in:
parent
69f336e59f
commit
842e3301ee
|
@ -65,7 +65,7 @@ const (
|
||||||
func (ms *MasterServer) LeaseAdminToken(ctx context.Context, req *master_pb.LeaseAdminTokenRequest) (*master_pb.LeaseAdminTokenResponse, error) {
|
func (ms *MasterServer) LeaseAdminToken(ctx context.Context, req *master_pb.LeaseAdminTokenRequest) (*master_pb.LeaseAdminTokenResponse, error) {
|
||||||
resp := &master_pb.LeaseAdminTokenResponse{}
|
resp := &master_pb.LeaseAdminTokenResponse{}
|
||||||
|
|
||||||
if ms.adminAccessLockTime.Add(LockDuration).After(time.Now()) {
|
if ms.adminAccessSecret != 0 && ms.adminAccessLockTime.Add(LockDuration).After(time.Now()) {
|
||||||
if req.PreviousToken != 0 && ms.isValidToken(time.Unix(0, req.PreviousLockTime), req.PreviousToken) {
|
if req.PreviousToken != 0 && ms.isValidToken(time.Unix(0, req.PreviousLockTime), req.PreviousToken) {
|
||||||
// for renew
|
// for renew
|
||||||
ts, token := ms.generateToken()
|
ts, token := ms.generateToken()
|
||||||
|
|
|
@ -13,6 +13,7 @@ import (
|
||||||
const (
|
const (
|
||||||
RenewInteval = 4 * time.Second
|
RenewInteval = 4 * time.Second
|
||||||
SafeRenewInteval = 3 * time.Second
|
SafeRenewInteval = 3 * time.Second
|
||||||
|
InitLockInteval = 1 * time.Second
|
||||||
)
|
)
|
||||||
|
|
||||||
type ExclusiveLocker struct {
|
type ExclusiveLocker struct {
|
||||||
|
@ -40,17 +41,15 @@ func (l *ExclusiveLocker) RequestLock() {
|
||||||
// retry to get the lease
|
// retry to get the lease
|
||||||
for {
|
for {
|
||||||
if err := l.masterClient.WithClient(func(client master_pb.SeaweedClient) error {
|
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 {
|
if err == nil {
|
||||||
atomic.StoreInt64(&l.token, resp.Token)
|
atomic.StoreInt64(&l.token, resp.Token)
|
||||||
atomic.StoreInt64(&l.lockTsNs, resp.LockTsNs)
|
atomic.StoreInt64(&l.lockTsNs, resp.LockTsNs)
|
||||||
}
|
}
|
||||||
return err
|
return err
|
||||||
}); err != nil {
|
}); err != nil {
|
||||||
time.Sleep(RenewInteval)
|
// println("leasing problem", err.Error())
|
||||||
|
time.Sleep(InitLockInteval)
|
||||||
} else {
|
} else {
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
|
@ -93,4 +92,6 @@ func (l *ExclusiveLocker) ReleaseLock() {
|
||||||
})
|
})
|
||||||
return nil
|
return nil
|
||||||
})
|
})
|
||||||
|
atomic.StoreInt64(&l.token, 0)
|
||||||
|
atomic.StoreInt64(&l.lockTsNs, 0)
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue