diff options
| author | Chris Lu <chris.lu@gmail.com> | 2020-10-13 00:29:46 -0700 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2020-10-13 00:29:46 -0700 |
| commit | 3f7d1d1bf146eaeac3ddcd96e3d8de088bdf97ce (patch) | |
| tree | 4c19cf7c8350a7be607f8fce612c46b109b0b5bc /weed/filer/filechunk_manifest.go | |
| parent | b18f21cce178b60531086f164d24e832a7b6eb86 (diff) | |
| download | seaweedfs-3f7d1d1bf146eaeac3ddcd96e3d8de088bdf97ce.tar.xz seaweedfs-3f7d1d1bf146eaeac3ddcd96e3d8de088bdf97ce.zip | |
Only wait on retryable requests
Diffstat (limited to 'weed/filer/filechunk_manifest.go')
| -rw-r--r-- | weed/filer/filechunk_manifest.go | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/weed/filer/filechunk_manifest.go b/weed/filer/filechunk_manifest.go index 2df8a4bbf..271d5e5ee 100644 --- a/weed/filer/filechunk_manifest.go +++ b/weed/filer/filechunk_manifest.go @@ -97,12 +97,16 @@ func retriedFetchChunkData(urlStrings []string, cipherKey []byte, isGzipped bool var err error var buffer bytes.Buffer + var shouldRetry bool for waitTime := time.Second; waitTime < ReadWaitTime; waitTime += waitTime / 2 { for _, urlString := range urlStrings { - err = util.ReadUrlAsStream(urlString, cipherKey, isGzipped, isFullChunk, offset, size, func(data []byte) { + shouldRetry, err = util.ReadUrlAsStream(urlString, cipherKey, isGzipped, isFullChunk, offset, size, func(data []byte) { buffer.Write(data) }) + if !shouldRetry { + break + } if err != nil { glog.V(0).Infof("read %s failed, err: %v", urlString, err) buffer.Reset() @@ -110,7 +114,7 @@ func retriedFetchChunkData(urlStrings []string, cipherKey []byte, isGzipped bool break } } - if err != nil { + if err != nil && shouldRetry{ glog.V(0).Infof("sleep for %v before retrying reading", waitTime) time.Sleep(waitTime) } else { |
