gitlab-com-seaweedfs/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2024-01-19 02:48:24 +00:00
Code Issues Projects Releases Wiki Activity

mount: add retry for all operations with filer

Browse source 
fix https://github.com/chrislusf/seaweedfs/issues/1589
This commit is contained in:
Chris Lu 2020-11-01 01:11:08 -07:00
parent de86945aeb
commit f7b21973ac
2 changed files with 29 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
weed/filesys/wfs_filer_client.go
View file

@ -1,6 +1,8 @@
package filesys
import (
"github.com/chrislusf/seaweedfs/weed/filer"
"github.com/chrislusf/seaweedfs/weed/util"
"google.golang.org/grpc"
"github.com/chrislusf/seaweedfs/weed/pb"
@ -11,10 +13,12 @@ var _ = filer_pb.FilerClient(&WFS{})
func (wfs *WFS) WithFilerClient(fn func(filer_pb.SeaweedFilerClient) error) error {
err := pb.WithCachedGrpcClient(func(grpcConnection *grpc.ClientConn) error {
client := filer_pb.NewSeaweedFilerClient(grpcConnection)
return fn(client)
}, wfs.option.FilerGrpcAddress, wfs.option.GrpcDialOption)
err := util.Retry("filer grpc", filer.ReadWaitTime, func() error {
return pb.WithCachedGrpcClient(func(grpcConnection *grpc.ClientConn) error {
client := filer_pb.NewSeaweedFilerClient(grpcConnection)
return fn(client)
}, wfs.option.FilerGrpcAddress, wfs.option.GrpcDialOption)
})
if err == nil {
return nil

21
weed/util/retry.go Normal file
View file

@ -0,0 +1,21 @@
package util
import (
"time"
"github.com/chrislusf/seaweedfs/weed/glog"
)
func Retry(name string, waitTimeLimit time.Duration, job func() error) (err error) {
waitTime := time.Second
for waitTime < waitTimeLimit {
err = job()
if err == nil {
break
}
glog.V(1).Infof("retry %s", name)
time.Sleep(waitTime)
waitTime += waitTime / 2
}
return err
}