report write error

This commit is contained in:
chrislu 2022-09-18 16:49:48 -07:00
parent 10d5b4b32b
commit 9d230521a4

View file

@ -170,6 +170,7 @@ func retriedStreamFetchChunkData(writer io.Writer, urlStrings []string, cipherKe
for waitTime := time.Second; waitTime < util.RetryWaitTime; waitTime += waitTime / 2 { for waitTime := time.Second; waitTime < util.RetryWaitTime; waitTime += waitTime / 2 {
for _, urlString := range urlStrings { for _, urlString := range urlStrings {
var localProcessed int var localProcessed int
var writeErr error
shouldRetry, err = util.ReadUrlAsStream(urlString+"?readDeleted=true", cipherKey, isGzipped, isFullChunk, offset, size, func(data []byte) { shouldRetry, err = util.ReadUrlAsStream(urlString+"?readDeleted=true", cipherKey, isGzipped, isFullChunk, offset, size, func(data []byte) {
if totalWritten > localProcessed { if totalWritten > localProcessed {
toBeSkipped := totalWritten - localProcessed toBeSkipped := totalWritten - localProcessed
@ -180,13 +181,18 @@ func retriedStreamFetchChunkData(writer io.Writer, urlStrings []string, cipherKe
data = data[toBeSkipped:] data = data[toBeSkipped:]
localProcessed += toBeSkipped localProcessed += toBeSkipped
} }
writer.Write(data) var writtenCount int
localProcessed += len(data) writtenCount, writeErr = writer.Write(data)
totalWritten += len(data) localProcessed += writtenCount
totalWritten += writtenCount
}) })
if !shouldRetry { if !shouldRetry {
break break
} }
if writeErr != nil {
err = writeErr
break
}
if err != nil { if err != nil {
glog.V(0).Infof("read %s failed, err: %v", urlString, err) glog.V(0).Infof("read %s failed, err: %v", urlString, err)
} else { } else {