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

ref #53480
pingcap · Nov 4, 2024 · bbf8742 · bbf8742
1 parent 64d4d21
commit bbf8742
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/br/pkg/backup/client.go b/br/pkg/backup/client.go
@@ -1277,6 +1277,7 @@ func (trecv *timeoutRecv) Refresh() {
 func (trecv *timeoutRecv) Stop() {
 	close(trecv.refresh)
 	trecv.wg.Wait()
+	trecv.cancel()
 }
 
 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())
+}