lsm/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2025-09-23 15:03:32 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix on finding lock owner

Browse Source
This commit is contained in:
Chris Lu
2024-02-05 17:30:14 -08:00
parent c471265837
commit fa72761bb8
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
weed/cluster/lock_manager/distributed_lock_manager.go
View File

@@ -55,7 +55,7 @@ func (dlm *DistributedLockManager) FindLockOwner(key string) (owner string, move
return return
} }
if movedTo != dlm.Host { if movedTo != dlm.Host {
glog.V(0).Infof("lock %s not on %s: to %s", key, dlm.Host, movedTo) glog.V(0).Infof("lock %s not on current %s but on %s", key, dlm.Host, movedTo)
return return
} }
owner, err = dlm.lockManager.GetLockOwner(key) owner, err = dlm.lockManager.GetLockOwner(key)

2
weed/server/filer_grpc_server_dlm.go
View File

@@ -83,7 +83,7 @@ func (fs *FilerServer) DistributedUnlock(ctx context.Context, req *filer_pb.Unlo
func (fs *FilerServer) FindLockOwner(ctx context.Context, req *filer_pb.FindLockOwnerRequest) (*filer_pb.FindLockOwnerResponse, error) { func (fs *FilerServer) FindLockOwner(ctx context.Context, req *filer_pb.FindLockOwnerRequest) (*filer_pb.FindLockOwnerResponse, error) {
owner, movedTo, err := fs.filer.Dlm.FindLockOwner(req.Name) owner, movedTo, err := fs.filer.Dlm.FindLockOwner(req.Name)
if !req.IsMoved && movedTo != "" && err == lock_manager.LockNotFound { if !req.IsMoved && movedTo != "" || err == lock_manager.LockNotFound {
err = pb.WithFilerClient(false, 0, movedTo, fs.grpcDialOption, func(client filer_pb.SeaweedFilerClient) error { err = pb.WithFilerClient(false, 0, movedTo, fs.grpcDialOption, func(client filer_pb.SeaweedFilerClient) error {
secondResp, err := client.FindLockOwner(context.Background(), &filer_pb.FindLockOwnerRequest{ secondResp, err := client.FindLockOwner(context.Background(), &filer_pb.FindLockOwnerRequest{
Name: req.Name, Name: req.Name,

2
weed/shell/command_mq_topic_list.go
View File

@@ -55,7 +55,7 @@ func findBrokerBalancer(commandEnv *CommandEnv) (brokerBalancer string, err erro
Name: pub_balancer.LockBrokerBalancer, Name: pub_balancer.LockBrokerBalancer,
}) })
if err != nil { if err != nil {
return err return fmt.Errorf("FindLockOwner: %v", err)
} }
brokerBalancer = resp.Owner brokerBalancer = resp.Owner
return nil return nil