From 88a2247d9ff364ec91fb325d45b3762aaabf4260 Mon Sep 17 00:00:00 2001
From: lance6716 <lance6716@gmail.com>
Date: Mon, 6 Jan 2025 19:13:19 +0800
Subject: [PATCH] dupdetect: gRPC cancel should trigger retry (#58542)

close pingcap/tidb#58523
---
 pkg/lightning/backend/local/duplicate.go | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkg/lightning/backend/local/duplicate.go b/pkg/lightning/backend/local/duplicate.go
index c77a77f1b8653..85fc9398ed5a5 100644
--- a/pkg/lightning/backend/local/duplicate.go
+++ b/pkg/lightning/backend/local/duplicate.go
@@ -997,8 +997,9 @@ func (m *dupeDetector) processRemoteDupTask(
 			}
 			return nil
 		}
-		if log.IsContextCanceledError(err) {
-			return errors.Trace(err)
+		if err2 := ctx.Err(); err2 != nil {
+			// stop retry when user cancel the context
+			return errors.Trace(err2)
 		}
 		if !madeProgress {
 			_, isRegionErr := errors.Cause(err).(regionError)