br: cancel context when timer stop (#56948) (#57009)

ref #53480
pingcap · Oct 31, 2024 · a86aac9 · a86aac9
1 parent e1ae550
commit a86aac9
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/br/pkg/backup/BUILD.bazel b/br/pkg/backup/BUILD.bazel
@@ -72,7 +72,7 @@ go_test(
     embed = [":backup"],
     flaky = True,
     race = "on",
-    shard_count = 12,
+    shard_count = 13,
     deps = [
         "//br/pkg/conn",
         "//br/pkg/gluetidb",

diff --git a/br/pkg/backup/client.go b/br/pkg/backup/client.go
@@ -1352,6 +1352,7 @@ func (trecv *timeoutRecv) Refresh() {
 func (trecv *timeoutRecv) Stop() {
 	close(trecv.refresh)
 	trecv.wg.Wait()
+	trecv.cancel(nil)
 }
 
 var TimeoutOneResponse = time.Hour

diff --git a/br/pkg/backup/store_test.go b/br/pkg/backup/store_test.go
@@ -96,3 +96,13 @@ func TestTimeoutRecvCancel(t *testing.T) {
 	cancel()
 	trecv.wg.Wait()
 }
+
+func TestTimeoutRecvCanceled(t *testing.T) {
+	ctx := context.Background()
+	cctx, cancel := context.WithCancel(ctx)
+	defer cancel()
+
+	tctx, trecv := StartTimeoutRecv(cctx, time.Hour)
+	trecv.Stop()
+	require.Equal(t, "context canceled", tctx.Err().Error())
+}