diff options
Diffstat (limited to 'weed/filesys')
| -rw-r--r-- | weed/filesys/meta_cache/meta_cache_init.go | 2 | ||||
| -rw-r--r-- | weed/filesys/wfs_filer_client.go | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/weed/filesys/meta_cache/meta_cache_init.go b/weed/filesys/meta_cache/meta_cache_init.go index 3461babcb..4089cea28 100644 --- a/weed/filesys/meta_cache/meta_cache_init.go +++ b/weed/filesys/meta_cache/meta_cache_init.go @@ -16,7 +16,7 @@ func EnsureVisited(mc *MetaCache, client filer_pb.FilerClient, dirPath util.Full glog.V(4).Infof("ReadDirAllEntries %s ...", path) - util.Retry("ReadDirAllEntries", filer.ReadWaitTime, func() error { + util.Retry("ReadDirAllEntries", func() error { err = filer_pb.ReadDirAllEntries(client, dirPath, "", func(pbEntry *filer_pb.Entry, isLast bool) error { entry := filer.FromPbEntry(string(dirPath), pbEntry) if err := mc.doInsertEntry(context.Background(), entry); err != nil { diff --git a/weed/filesys/wfs_filer_client.go b/weed/filesys/wfs_filer_client.go index 5eb3587dd..dd76f5669 100644 --- a/weed/filesys/wfs_filer_client.go +++ b/weed/filesys/wfs_filer_client.go @@ -1,7 +1,6 @@ package filesys import ( - "github.com/chrislusf/seaweedfs/weed/filer" "github.com/chrislusf/seaweedfs/weed/util" "google.golang.org/grpc" @@ -13,7 +12,7 @@ var _ = filer_pb.FilerClient(&WFS{}) func (wfs *WFS) WithFilerClient(fn func(filer_pb.SeaweedFilerClient) error) error { - err := util.Retry("filer grpc", filer.ReadWaitTime, func() error { + err := util.Retry("filer grpc", func() error { return pb.WithCachedGrpcClient(func(grpcConnection *grpc.ClientConn) error { client := filer_pb.NewSeaweedFilerClient(grpcConnection) return fn(client) |