refactoring

weed/shell/commands.go

@@ -13,6 +13,7 @@ import (
 	"github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
 	"github.com/chrislusf/seaweedfs/weed/util"
 	"github.com/chrislusf/seaweedfs/weed/wdclient"
+	"github.com/chrislusf/seaweedfs/weed/wdclient/exclusive_locks"
 )
 
 type ShellOptions struct {
@@ -28,7 +29,7 @@ type CommandEnv struct {
 	env          map[string]string
 	MasterClient *wdclient.MasterClient
 	option       ShellOptions
-	locker       *ExclusiveLocker
+	locker       *exclusive_locks.ExclusiveLocker
 }
 
 type command interface {
@@ -47,7 +48,7 @@ func NewCommandEnv(options ShellOptions) *CommandEnv {
 		MasterClient: wdclient.NewMasterClient(options.GrpcDialOption, pb.AdminShellClient, "", 0, strings.Split(*options.Masters, ",")),
 		option:       options,
 	}
-	ce.locker = NewExclusiveLocker(ce.MasterClient)
+	ce.locker = exclusive_locks.NewExclusiveLocker(ce.MasterClient)
 	return ce
 }
 
@@ -70,7 +71,7 @@ func (ce *CommandEnv) isDirectory(path string) bool {
 
 func (ce *CommandEnv) confirmIsLocked() error {
 
-	if ce.locker.isLocking {
+	if ce.locker.IsLocking() {
 		return nil
 	}
 

weed/shell/exclusive_locker.go → weed/wdclient/exclusive_locks/exclusive_locker.go

@@ -1,4 +1,4 @@
-package shell
+package exclusive_locks
 
 import (
 	"context"
@@ -29,6 +29,9 @@ func NewExclusiveLocker(masterClient *wdclient.MasterClient) *ExclusiveLocker {
 		masterClient: masterClient,
 	}
 }
+func (l *ExclusiveLocker) IsLocking() bool {
+	return l.isLocking
+}
 
 func (l *ExclusiveLocker) GetToken() (token int64, lockTsNs int64) {
 	for time.Unix(0, atomic.LoadInt64(&l.lockTsNs)).Add(SafeRenewInteval).Before(time.Now()) {
@@ -39,6 +42,10 @@ func (l *ExclusiveLocker) GetToken() (token int64, lockTsNs int64) {
 }
 
 func (l *ExclusiveLocker) RequestLock() {
+	if 	l.isLocking {
+		return
+	}
+
 	// retry to get the lease
 	for {
 		if err := l.masterClient.WithClient(func(client master_pb.SeaweedClient) error {