fix(storage): wait for XML read req to finish to avoid data races (#11527)

BrennaEpp · web-flow · commit 782e12a11c1d · 2025-01-29T18:40:50.000-05:00
Fixes TestRetryReadStallEmulated failing with `-race`
diff --git a/storage/http_client.go b/storage/http_client.go
@@ -946,10 +946,11 @@ func (c *httpStorageClient) newRangeReaderXML(ctx context.Context, params *newRa
 			case <-timer:
 				log.Printf("stalled read-req (%p) cancelled after %fs", req, stallTimeout.Seconds())
 				cancel()
-				err = context.DeadlineExceeded
+				<-done
 				if res != nil && res.Body != nil {
 					res.Body.Close()
 				}
+				return res, context.DeadlineExceeded
 			case <-done:
 				cancel = nil
 			}

Original file line number	Diff line number	Diff line change
`@@ -946,10 +946,11 @@ func (c httpStorageClient) newRangeReaderXML(ctx context.Context, params newRa`
`946`	`946`	`case <-timer:`
`947`	`947`	`log.Printf("stalled read-req (%p) cancelled after %fs", req, stallTimeout.Seconds())`
`948`	`948`	`cancel()`
`949`		`- err = context.DeadlineExceeded`
	`949`	`+ <-done`
`950`	`950`	`if res != nil && res.Body != nil {`
`951`	`951`	`res.Body.Close()`
`952`	`952`	`}`
	`953`	`+ return res, context.DeadlineExceeded`
`953`	`954`	`case <-done:`
`954`	`955`	`cancel = nil`
`955`	`956`	`}`