diff options
| author | Chris Lu <chris.lu@gmail.com> | 2021-05-07 07:29:26 -0700 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2021-05-07 07:29:26 -0700 |
| commit | 8f8738867f10c98d59b11eaf165e1c6028d7b1d0 (patch) | |
| tree | db57540c45309f15d0efdaed274f84ece94f5a05 /weed/server/webdav_server.go | |
| parent | 007401f3a0b87f0a3d07f16ea731d6eec63d6975 (diff) | |
| download | seaweedfs-8f8738867f10c98d59b11eaf165e1c6028d7b1d0.tar.xz seaweedfs-8f8738867f10c98d59b11eaf165e1c6028d7b1d0.zip | |
add retry to assign volume
fix https://github.com/chrislusf/seaweedfs/issues/2056
Diffstat (limited to 'weed/server/webdav_server.go')
| -rw-r--r-- | weed/server/webdav_server.go | 41 |
1 files changed, 24 insertions, 17 deletions
diff --git a/weed/server/webdav_server.go b/weed/server/webdav_server.go index c3f68fdee..c6550a36f 100644 --- a/weed/server/webdav_server.go +++ b/weed/server/webdav_server.go @@ -380,25 +380,32 @@ func (f *WebDavFile) saveDataAsChunk(reader io.Reader, name string, offset int64 ctx := context.Background() - request := &filer_pb.AssignVolumeRequest{ - Count: 1, - Replication: f.fs.option.Replication, - Collection: f.fs.option.Collection, - DiskType: f.fs.option.DiskType, - Path: name, - } + assignErr := util.Retry("assignVolume", func() error { + request := &filer_pb.AssignVolumeRequest{ + Count: 1, + Replication: f.fs.option.Replication, + Collection: f.fs.option.Collection, + DiskType: f.fs.option.DiskType, + Path: name, + } - resp, err := client.AssignVolume(ctx, request) - if err != nil { - glog.V(0).Infof("assign volume failure %v: %v", request, err) - return err - } - if resp.Error != "" { - return fmt.Errorf("assign volume failure %v: %v", request, resp.Error) - } + resp, err := client.AssignVolume(ctx, request) + if err != nil { + glog.V(0).Infof("assign volume failure %v: %v", request, err) + return err + } + if resp.Error != "" { + return fmt.Errorf("assign volume failure %v: %v", request, resp.Error) + } + + fileId, host, auth = resp.FileId, resp.Url, security.EncodedJwt(resp.Auth) + f.collection, f.replication = resp.Collection, resp.Replication - fileId, host, auth = resp.FileId, resp.Url, security.EncodedJwt(resp.Auth) - f.collection, f.replication = resp.Collection, resp.Replication + return nil + }) + if assignErr != nil { + return assignErr + } return nil }); flushErr != nil { |
