Use RetryReader when reading from Azure

DanielOliverRJ · DanielOliverRJ · commit bcf1af77594a · 2025-08-13T13:17:00.000+01:00
diff --git a/pbm/storage/azure/azure.go b/pbm/storage/azure/azure.go
@@ -221,7 +221,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
`@@ -221,7 +221,14 @@ func (b *Blob) SourceReader(name string) (io.ReadCloser, error) {`
`221`	`221`	`return nil, errors.Wrap(err, "download object")`
`222`	`222`	`}`
`223`	`223`
`224`		`- return o.Body, nil`
	`224`	`+ rr := o.NewRetryReader(context.TODO(), &azblob.RetryReaderOptions{`
	`225`	`+ EarlyCloseAsError: true,`
	`226`	`+ OnFailedRead: func(failureCount int32, lastError error, rnge azblob.HTTPRange, willRetry bool) {`
	`227`	`+ // failureCount is reset on each call to Read(), so repeats of "attempt 1" are expected`
	`228`	`+ b.log.Debug("Read from Azure failed (attempt %d): %v, retrying: %v\n", failureCount, lastError, willRetry)`
	`229`	`+ },`
	`230`	`+ })`
	`231`	`+ return rr, nil`
`225`	`232`	`}`
`226`	`233`
`227`	`234`	`func (b *Blob) Delete(name string) error {`