diff options
| author | chrislu <chris.lu@gmail.com> | 2023-09-19 14:10:54 -0700 |
|---|---|---|
| committer | chrislu <chris.lu@gmail.com> | 2023-09-19 14:10:54 -0700 |
| commit | d531b7cbbfb6cc33fb70c244a2c5977431ec2979 (patch) | |
| tree | ae137e08807157b1740fd54d85a6026b0e9e535b /weed/server/filer_grpc_server_dlm.go | |
| parent | b18112ae10f2d342c8fc31145ad90586222290e5 (diff) | |
| download | seaweedfs-d531b7cbbfb6cc33fb70c244a2c5977431ec2979.tar.xz seaweedfs-d531b7cbbfb6cc33fb70c244a2c5977431ec2979.zip | |
merge some previous missing changes
Diffstat (limited to 'weed/server/filer_grpc_server_dlm.go')
| -rw-r--r-- | weed/server/filer_grpc_server_dlm.go | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/weed/server/filer_grpc_server_dlm.go b/weed/server/filer_grpc_server_dlm.go index cf7014cd3..1f5644680 100644 --- a/weed/server/filer_grpc_server_dlm.go +++ b/weed/server/filer_grpc_server_dlm.go @@ -19,7 +19,7 @@ func (fs *FilerServer) DistributedLock(ctx context.Context, req *filer_pb.LockRe var movedTo pb.ServerAddress expiredAtNs := time.Now().Add(time.Duration(req.SecondsToLock) * time.Second).UnixNano() resp.RenewToken, movedTo, err = fs.filer.Dlm.LockWithTimeout(req.Name, expiredAtNs, req.RenewToken, req.Owner) - glog.Infof("lock %s %v %v %v, isMoved=%v %v", req.Name, req.SecondsToLock, req.RenewToken, req.Owner, req.IsMoved, movedTo) + glog.V(3).Infof("lock %s %v %v %v, isMoved=%v %v", req.Name, req.SecondsToLock, req.RenewToken, req.Owner, req.IsMoved, movedTo) if movedTo != "" && movedTo != fs.option.Host && !req.IsMoved { err = pb.WithFilerClient(false, 0, movedTo, fs.grpcDialOption, func(client filer_pb.SeaweedFilerClient) error { secondResp, err := client.DistributedLock(context.Background(), &filer_pb.LockRequest{ @@ -90,8 +90,11 @@ func (fs *FilerServer) FindLockOwner(ctx context.Context, req *filer_pb.FindLock Name: req.Name, IsMoved: true, }) + if err != nil { + return err + } owner = secondResp.Owner - return err + return nil }) if err != nil { return nil, err |