Merge pull request #1177 from ripjar/LS-20087

boris-ilijic · web-flow · commit e11316d1d1f2 · 2025-10-10T15:03:24.000+02:00
PBM-1593 Use RetryReader when reading from Azure
diff --git a/pbm/storage/azure/azure.go b/pbm/storage/azure/azure.go
@@ -324,7 +324,14 @@ func (b *Blob) SourceReader(name string) (io.ReadCloser, error) {
 		return nil, errors.Wrap(err, "download object")
 	}
 
-	return o.Body, nil
+	rr := o.NewRetryReader(context.TODO(), &azblob.RetryReaderOptions{
+		EarlyCloseAsError: true,
+		OnFailedRead: func(failureCount int32, lastError error, rnge azblob.HTTPRange, willRetry bool) {
+			// failureCount is reset on each call to Read(), so repeats of "attempt 1" are expected
+			b.log.Debug("Read from Azure failed (attempt %d): %v, retrying: %v", failureCount, lastError, willRetry)
+		},
+	})
+	return rr, nil
 }
 
 func (b *Blob) Delete(name string) error {

Original file line number	Diff line number	Diff line change
`@@ -324,7 +324,14 @@ func (b *Blob) SourceReader(name string) (io.ReadCloser, error) {`
`324`	`324`	`return nil, errors.Wrap(err, "download object")`
`325`	`325`	`}`
`326`	`326`
`327`		`- return o.Body, nil`
	`327`	`+ rr := o.NewRetryReader(context.TODO(), &azblob.RetryReaderOptions{`
	`328`	`+ EarlyCloseAsError: true,`
	`329`	`+ OnFailedRead: func(failureCount int32, lastError error, rnge azblob.HTTPRange, willRetry bool) {`
	`330`	`+ // failureCount is reset on each call to Read(), so repeats of "attempt 1" are expected`
	`331`	`+ b.log.Debug("Read from Azure failed (attempt %d): %v, retrying: %v", failureCount, lastError, willRetry)`
	`332`	`+ },`
	`333`	`+ })`
	`334`	`+ return rr, nil`
`328`	`335`	`}`
`329`	`336`
`330`	`337`	`func (b *Blob) Delete(name string) error {`