fix(storage): retry url.Error and net.OpErrors when they wrap an io.EOF (#12289)

BrennaEpp · tritone · web-flow · commit 080f6b05c5e8 · 2025-05-20T16:27:01.000-04:00
Co-authored-by: Chris Cotter &lt;cjcotter@google.com&gt;
diff --git a/storage/invoke.go b/storage/invoke.go
@@ -174,9 +174,9 @@ func ShouldRetry(err error) bool {
 		// We don't want to retry io.EOF errors, since these can indicate normal
 		// functioning terminations such as internally in the case of Reader and
 		// externally in the case of iterator methods. However, the linked bug
-		// requires us to retry EOFs that it causes. We can distinguish
-		// EOFs caused by the bug because they are not wrapped correctly.
-		if !errors.Is(err, io.EOF) && strings.Contains(err.Error(), "EOF") {
+		// requires us to retry the EOFs that it causes, which should be wrapped
+		// in net or url errors.
+		if errors.Is(err, io.EOF) {
 			return true
 		}
 	case *net.DNSError:
