|
|
@ -3,6 +3,7 @@ package weed_server |
|
|
import ( |
|
|
import ( |
|
|
"context" |
|
|
"context" |
|
|
"fmt" |
|
|
"fmt" |
|
|
|
|
|
"strings" |
|
|
"time" |
|
|
"time" |
|
|
|
|
|
|
|
|
"github.com/seaweedfs/seaweedfs/weed/cluster/lock_manager" |
|
|
"github.com/seaweedfs/seaweedfs/weed/cluster/lock_manager" |
|
|
@ -51,7 +52,9 @@ func (fs *FilerServer) DistributedLock(ctx context.Context, req *filer_pb.LockRe |
|
|
|
|
|
|
|
|
if err != nil { |
|
|
if err != nil { |
|
|
resp.Error = fmt.Sprintf("%v", err) |
|
|
resp.Error = fmt.Sprintf("%v", err) |
|
|
glog.V(0).Infof("FILER LOCK: Error - name=%s error=%s", req.Name, resp.Error) |
|
|
|
|
|
|
|
|
if !strings.Contains(resp.Error, "lock already owned") { |
|
|
|
|
|
glog.V(0).Infof("FILER LOCK: Error - name=%s error=%s", req.Name, resp.Error) |
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
if movedTo != "" { |
|
|
if movedTo != "" { |
|
|
resp.LockHostMovedTo = string(movedTo) |
|
|
resp.LockHostMovedTo = string(movedTo) |
|
|
|