add a switch in cfg to enable the read ts validator

Signed-off-by: ekexium <[email protected]>

config/config.go

@@ -81,7 +81,8 @@ type Config struct {
 	// RegionsRefreshInterval indicates the interval of loading regions info, the unit is second, if RegionsRefreshInterval == 0, it will be disabled.
 	RegionsRefreshInterval uint64
 	// EnablePreload indicates whether to preload region info when initializing the client.
-	EnablePreload bool
+	EnablePreload         bool
+	EnableReadTSValidator bool
 }
 
 // DefaultConfig returns the default configuration.
@@ -99,6 +100,7 @@ func DefaultConfig() Config {
 		TxnScope:              "",
 		EnableAsyncCommit:     false,
 		Enable1PC:             false,
+		EnableReadTSValidator: true,
 	}
 }
 

internal/locate/region_request.go

@@ -37,6 +37,7 @@ package locate
 import (
 	"context"
 	"fmt"
+	"github.com/tikv/client-go/v2/config"
 	"maps"
 	"math/rand"
 	"strconv"
@@ -105,17 +106,18 @@ func LoadShuttingDown() uint32 {
 // For other region errors, since region range have changed, the request may need to
 // split, so we simply return the error to caller.
 type RegionRequestSender struct {
-	regionCache       *RegionCache
-	apiVersion        kvrpcpb.APIVersion
-	client            client.Client
-	readTSValidator   oracle.ReadTSValidator
-	storeAddr         string
-	rpcError          error
-	replicaSelector   *replicaSelector
-	failStoreIDs      map[uint64]struct{}
-	failProxyStoreIDs map[uint64]struct{}
-	Stats             *RegionRequestRuntimeStats
-	AccessStats       *ReplicaAccessStats
+	regionCache           *RegionCache
+	apiVersion            kvrpcpb.APIVersion
+	client                client.Client
+	readTSValidator       oracle.ReadTSValidator
+	storeAddr             string
+	rpcError              error
+	replicaSelector       *replicaSelector
+	failStoreIDs          map[uint64]struct{}
+	failProxyStoreIDs     map[uint64]struct{}
+	Stats                 *RegionRequestRuntimeStats
+	AccessStats           *ReplicaAccessStats
+	enableReadTsValidator bool
 }
 
 func (s *RegionRequestSender) String() string {
@@ -402,6 +404,9 @@ func (s *ReplicaAccessStats) String() string {
 
 // NewRegionRequestSender creates a new sender.
 func NewRegionRequestSender(regionCache *RegionCache, client client.Client, readTSValidator oracle.ReadTSValidator) *RegionRequestSender {
+	if !config.GetGlobalConfig().EnableReadTSValidator {
+		readTSValidator = oracle.NoopReadTSValidator{}
+	}
 	return &RegionRequestSender{
 		regionCache:     regionCache,
 		apiVersion:      regionCache.codec.GetAPIVersion(),

oracle/oracles/pd.go

@@ -37,6 +37,7 @@ package oracles
 import (
 	"context"
 	"fmt"
+	"github.com/pingcap/failpoint"
 	"math"
 	"strings"
 	"sync"
@@ -695,6 +696,11 @@ func (o *pdOracle) ValidateReadTS(ctx context.Context, readTS uint64, isStaleRea
 			o.adjustUpdateLowResolutionTSIntervalWithRequestedStaleness(readTS, estimatedCurrentTS, time.Now())
 		}
 	}
+
+	failpoint.Inject("failOnValidateReadTS", func(val failpoint.Value) {
+		errRet = errors.New(val.(string))
+	})
+
 	return nil
 }