br: fix backoffer can't handle multierrs (#54084) (#54109)

ti-chi-bot · web-flow · commit cd2bc64c95a3 · 2024-09-04T08:48:10.000Z
close #54053
diff --git a/br/pkg/restore/import_retry_test.go b/br/pkg/restore/import_retry_test.go
@@ -610,7 +610,6 @@ func TestRetryRecognizeErrCode(t *testing.T) {
 		outer++
 		return errors.Trace(e)
 	}, utils.NewBackoffer(10, waitTime, maxWaitTime, utils.NewErrorContext("import sst", 3)))
-	// require.Error(t, ctx.Err())
 	require.Equal(t, 10, outer)
 	require.Equal(t, 100, inner)
 }
diff --git a/br/pkg/restore/log_client/BUILD.bazel b/br/pkg/restore/log_client/BUILD.bazel
diff --git a/br/pkg/utils/backoff.go b/br/pkg/utils/backoff.go
@@ -174,6 +174,9 @@ func (bo *importerBackoffer) NextBackoff(err error) time.Duration {
 			case codes.Unavailable, codes.Aborted:
 				bo.delayTime = 2 * bo.delayTime
 				bo.attempt--
+			case codes.Canceled:
+				bo.delayTime = 0
+				bo.attempt = 0
 			default:
 				// Unexpected error
 				bo.delayTime = 0

Original file line number	Diff line number	Diff line change
`@@ -610,7 +610,6 @@ func TestRetryRecognizeErrCode(t *testing.T) {`
`610`	`610`	`outer++`
`611`	`611`	`return errors.Trace(e)`
`612`	`612`	`}, utils.NewBackoffer(10, waitTime, maxWaitTime, utils.NewErrorContext("import sst", 3)))`
`613`		`- // require.Error(t, ctx.Err())`
`614`	`613`	`require.Equal(t, 10, outer)`
`615`	`614`	`require.Equal(t, 100, inner)`
`616`	`615`	`}`