(tidb-7.1) Use global txn scope when validating ts (#1580)

ekexium · web-flow · commit 8e7b324b5e6e · 2025-02-18T01:43:31.000Z
Signed-off-by: ekexium &lt;eke@fastmail.com&gt;
diff --git a/internal/locate/region_request.go b/internal/locate/region_request.go
@@ -2222,7 +2222,7 @@ func (s *RegionRequestSender) validateReadTS(ctx context.Context, req *tikvrpc.R
 	default:
 		return nil
 	}
-	return s.readTSValidator.ValidateReadTS(ctx, readTS, req.StaleRead, &oracle.Option{TxnScope: req.TxnScope})
+	return s.readTSValidator.ValidateReadTS(ctx, readTS, req.StaleRead, &oracle.Option{TxnScope: oracle.GlobalTxnScope})
 }
 
 type staleReadMetricsCollector struct {

Original file line number	Diff line number	Diff line change
`@@ -2222,7 +2222,7 @@ func (s RegionRequestSender) validateReadTS(ctx context.Context, req tikvrpc.R`
`2222`	`2222`	`default:`
`2223`	`2223`	`return nil`
`2224`	`2224`	`}`
`2225`		`- return s.readTSValidator.ValidateReadTS(ctx, readTS, req.StaleRead, &oracle.Option{TxnScope: req.TxnScope})`
	`2225`	`+ return s.readTSValidator.ValidateReadTS(ctx, readTS, req.StaleRead, &oracle.Option{TxnScope: oracle.GlobalTxnScope})`
`2226`	`2226`	`}`
`2227`	`2227`
`2228`	`2228`	`type staleReadMetricsCollector struct {`