dupdetect: gRPC cancel should trigger retry (#58542)

lance6716 · web-flow · commit 88a2247d9ff3 · 2025-01-06T11:13:19.000Z
close #58523
diff --git 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)

Original file line number	Diff line number	Diff line change
`@@ -997,8 +997,9 @@ func (m *dupeDetector) processRemoteDupTask(`
`997`	`997`	`}`
`998`	`998`	`return nil`
`999`	`999`	`}`
`1000`		`- if log.IsContextCanceledError(err) {`
`1001`		`- return errors.Trace(err)`
	`1000`	`+ if err2 := ctx.Err(); err2 != nil {`
	`1001`	`+ // stop retry when user cancel the context`
	`1002`	`+ return errors.Trace(err2)`
`1002`	`1003`	`}`
`1003`	`1004`	`if !madeProgress {`
`1004`	`1005`	`_, isRegionErr := errors.Cause(err).(regionError)`