diff --git a/weed/mount/wfs_filer_client.go b/weed/mount/wfs_filer_client.go index 5dd09363f..d12fca76e 100644 --- a/weed/mount/wfs_filer_client.go +++ b/weed/mount/wfs_filer_client.go @@ -5,7 +5,6 @@ import ( "google.golang.org/grpc" - "github.com/seaweedfs/seaweedfs/weed/glog" "github.com/seaweedfs/seaweedfs/weed/pb" "github.com/seaweedfs/seaweedfs/weed/pb/filer_pb" "github.com/seaweedfs/seaweedfs/weed/util" @@ -28,7 +27,7 @@ func (wfs *WFS) WithFilerClient(streamingMode bool, fn func(filer_pb.SeaweedFile }, filerGrpcAddress, false, wfs.option.GrpcDialOption) if err != nil { - glog.V(0).Infof("WithFilerClient %d %v: %v", x, filerGrpcAddress, err) + // glog.V(0).Infof("WithFilerClient %d %v: %v", x, filerGrpcAddress, err) } else { atomic.StoreInt32(&wfs.option.filerIndex, i) return nil diff --git a/weed/mount/wfs_save.go b/weed/mount/wfs_save.go index 56ad47011..93ab47e97 100644 --- a/weed/mount/wfs_save.go +++ b/weed/mount/wfs_save.go @@ -3,12 +3,13 @@ package mount import ( "context" "fmt" + "syscall" + "github.com/hanwen/go-fuse/v2/fuse" "github.com/seaweedfs/seaweedfs/weed/filer" "github.com/seaweedfs/seaweedfs/weed/glog" "github.com/seaweedfs/seaweedfs/weed/pb/filer_pb" "github.com/seaweedfs/seaweedfs/weed/util" - "syscall" ) func (wfs *WFS) saveEntry(path util.FullPath, entry *filer_pb.Entry) (code fuse.Status) { @@ -33,7 +34,7 @@ func (wfs *WFS) saveEntry(path util.FullPath, entry *filer_pb.Entry) (code fuse. } if err := wfs.metaCache.UpdateEntry(context.Background(), filer.FromPbEntry(request.Directory, request.Entry)); err != nil { - return fmt.Errorf("UpdateEntry dir %s: %v", path, err) + return fmt.Errorf("metaCache.UpdateEntry dir %s: %w", path, err) } return nil diff --git a/weed/util/retry.go b/weed/util/retry.go index 006cda466..150c10af5 100644 --- a/weed/util/retry.go +++ b/weed/util/retry.go @@ -67,7 +67,7 @@ func RetryUntil(name string, job func() error, onErrFn func(err error) (shouldCo break } if onErrFn(err) { - if strings.Contains(err.Error(), "transport") { + if strings.Contains(err.Error(), "transport") || strings.Contains(err.Error(), "ResourceExhausted") || strings.Contains(err.Error(), "Unavailable") { glog.V(0).Infof("retry %s: err: %v", name, err) } time.Sleep(waitTime)