(tidb-8.5) Use global txn scope when validating ts (#1583)

ekexium · web-flow · commit 7da5131417f3 · 2025-02-18T01:49:24.000Z
Signed-off-by: ekexium &lt;eke@fastmail.com&gt;
diff --git a/internal/locate/region_request.go b/internal/locate/region_request.go
@@ -1799,7 +1799,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
`@@ -1799,7 +1799,7 @@ func (s RegionRequestSender) validateReadTS(ctx context.Context, req tikvrpc.R`
`1799`	`1799`	`default:`
`1800`	`1800`	`return nil`
`1801`	`1801`	`}`
`1802`		`- return s.readTSValidator.ValidateReadTS(ctx, readTS, req.StaleRead, &oracle.Option{TxnScope: req.TxnScope})`
	`1802`	`+ return s.readTSValidator.ValidateReadTS(ctx, readTS, req.StaleRead, &oracle.Option{TxnScope: oracle.GlobalTxnScope})`
`1803`	`1803`	`}`
`1804`	`1804`
`1805`	`1805`	`type staleReadMetricsCollector struct {`