br: avoid retry if it's ec2metadata (pingcap#47651) (pingcap#47789)

close pingcap#47650
ti-chi-bot · Oct 19, 2023 · 0540e51 · 0540e51
1 parent 7305408
commit 0540e51
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/br/pkg/storage/s3.go b/br/pkg/storage/s3.go
@@ -965,14 +965,14 @@ func (rl retryerWithLog) ShouldRetry(r *request.Request) bool {
 			r.Error = errors.New("read tcp *.*.*.*:*->*.*.*.*:*: read: connection reset by peer")
 		}
 	})
-	if isConnectionResetError(r.Error) {
-		return true
-	}
-	if isDeadlineExceedError(r.Error) && r.HTTPRequest.URL.Host == ec2MetaAddress {
+	if r.HTTPRequest.URL.Host == ec2MetaAddress && (isDeadlineExceedError(r.Error) || isConnectionResetError(r.Error)) {
 		// fast fail for unreachable linklocal address in EC2 containers.
 		log.Warn("failed to get EC2 metadata. skipping.", logutil.ShortError(r.Error))
 		return false
 	}
+	if isConnectionResetError(r.Error) {
+		return true
+	}
 	return rl.DefaultRetryer.ShouldRetry(r)
 }