diff options
| author | chrislu <chris.lu@gmail.com> | 2024-02-02 15:54:57 -0800 |
|---|---|---|
| committer | chrislu <chris.lu@gmail.com> | 2024-02-02 15:54:57 -0800 |
| commit | d41792461cfaae905808ec5f9a602a81f5e1cb5c (patch) | |
| tree | edcf74fe1b3752bb3a9980e163f59efac6be0a6e /weed/server | |
| parent | d30150dde18c21c3c3af97cd935da27e2213f8cf (diff) | |
| download | seaweedfs-d41792461cfaae905808ec5f9a602a81f5e1cb5c.tar.xz seaweedfs-d41792461cfaae905808ec5f9a602a81f5e1cb5c.zip | |
lock returns host and owner
Diffstat (limited to 'weed/server')
| -rw-r--r-- | weed/server/filer_grpc_server_dlm.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/weed/server/filer_grpc_server_dlm.go b/weed/server/filer_grpc_server_dlm.go index f3765e549..e685b8f0d 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) + resp.LockOwner, resp.RenewToken, movedTo, err = fs.filer.Dlm.LockWithTimeout(req.Name, expiredAtNs, req.RenewToken, req.Owner) 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 { @@ -32,6 +32,7 @@ func (fs *FilerServer) DistributedLock(ctx context.Context, req *filer_pb.LockRe }) if err == nil { resp.RenewToken = secondResp.RenewToken + resp.LockOwner = secondResp.LockOwner } else { resp.Error = secondResp.Error } @@ -43,7 +44,7 @@ func (fs *FilerServer) DistributedLock(ctx context.Context, req *filer_pb.LockRe resp.Error = fmt.Sprintf("%v", err) } if movedTo != "" { - resp.MovedTo = string(movedTo) + resp.LockHostMovedTo = string(movedTo) } return resp, nil |