Fix retry on timeouts (#304)

Fix retry after Go 1.23 change: golang/go#50856
minio · Sep 5, 2024 · 6aad3ae · 6aad3ae
1 parent 793e1bf
commit 6aad3ae
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/api.go b/api.go
@@ -404,8 +404,9 @@ func (adm AdminClient) executeMethod(ctx context.Context, method string, reqData
 			if errors.Is(err, syscall.ECONNREFUSED) {
 				return nil, err
 			}
-			if err == context.Canceled || err == context.DeadlineExceeded {
-				return nil, err
+			// Give up if caller canceled.
+			if ctx.Err() != nil {
+				return nil, ctx.Err()
 			}
 			// retry all network errors.
 			continue

diff --git a/perf-client.go b/perf-client.go
@@ -102,7 +102,7 @@ func (adm *AdminClient) ClientPerf(ctx context.Context, dur time.Duration) (resu
 		contentReader: reader,
 	})
 	reader.End()
-	if errors.Is(err, context.DeadlineExceeded) {
+	if errors.Is(err, context.DeadlineExceeded) && ctx.Err() != nil {
 		err = nil
 	}