Use RetryReader when reading from Azure

DanielOliverRJ · DanielOliverRJ · commit 3639bee06b18 · 2025-08-13T13:33:27.000+01:00
diff --git a/pbm/storage/azure/azure.go b/pbm/storage/azure/azure.go
@@ -302,7 +302,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\n", failureCount, lastError, willRetry)
+		},
+	})
+	return rr, nil
 }
 
 func (b *Blob) Delete(name string) error {

Original file line number	Diff line number	Diff line change
`@@ -302,7 +302,14 @@ func (b *Blob) SourceReader(name string) (io.ReadCloser, error) {`
`302`	`302`	`return nil, errors.Wrap(err, "download object")`
`303`	`303`	`}`
`304`	`304`
`305`		`- return o.Body, nil`
	`305`	`+ rr := o.NewRetryReader(context.TODO(), &azblob.RetryReaderOptions{`
	`306`	`+ EarlyCloseAsError: true,`
	`307`	`+ OnFailedRead: func(failureCount int32, lastError error, rnge azblob.HTTPRange, willRetry bool) {`
	`308`	`+ // failureCount is reset on each call to Read(), so repeats of "attempt 1" are expected`
	`309`	`+ b.log.Debug("Read from Azure failed (attempt %d): %v, retrying: %v\n", failureCount, lastError, willRetry)`
	`310`	`+ },`
	`311`	`+ })`
	`312`	`+ return rr, nil`
`306`	`313`	`}`
`307`	`314`
`308`	`315`	`func (b *Blob) Delete(name string) error {`