diff --git a/DEPS.bzl b/DEPS.bzl index c7809d341986f..a3d0b72bf876a 100644 --- a/DEPS.bzl +++ b/DEPS.bzl @@ -3863,8 +3863,8 @@ def go_deps(): name = "com_github_tikv_client_go_v2", build_file_proto_mode = "disable_global", importpath = "github.com/tikv/client-go/v2", - sum = "h1:pLUQsFZGE3z7OlZddP+WHkb85rLoxPwRd8CknfSw804=", - version = "v2.0.8-0.20230707070242-178f6fa01aab", + sum = "h1:wRqy8mHs5IocLn4pDvqrwGs4lc3wKhdDXxFyLi8kNbQ=", + version = "v2.0.8-0.20230711075855-e540aa3b9657", ) go_repository( diff --git a/br/pkg/gluetidb/glue.go b/br/pkg/gluetidb/glue.go index 3dbf8be5d31bd..16ca2077d5a57 100644 --- a/br/pkg/gluetidb/glue.go +++ b/br/pkg/gluetidb/glue.go @@ -6,6 +6,7 @@ import ( "bytes" "context" "strings" + "time" "github.com/pingcap/errors" "github.com/pingcap/log" @@ -44,6 +45,7 @@ func New() Glue { config.UpdateGlobal(func(conf *config.Config) { conf.SkipRegisterToDashboard = true conf.Log.EnableSlowLog.Store(false) + conf.TiKVClient.CoprReqTimeout = 1800 * time.Second }) return Glue{} } diff --git a/config/config_test.go b/config/config_test.go index e54e0a026051d..51ff37ab6a832 100644 --- a/config/config_test.go +++ b/config/config_test.go @@ -25,6 +25,7 @@ import ( "regexp" "strings" "testing" + "time" "github.com/BurntSushi/toml" "github.com/pingcap/errors" @@ -752,6 +753,7 @@ region-cache-ttl=6000 store-limit=0 ttl-refreshed-txn-size=8192 resolve-lock-lite-threshold = 16 +copr-req-timeout = "120s" [tikv-client.async-commit] keys-limit=123 total-key-size-limit=1024 @@ -808,6 +810,7 @@ max_connections = 200 require.Equal(t, uint64(10000), conf.SplitRegionMaxNum) require.True(t, conf.RepairMode) require.Equal(t, uint64(16), conf.TiKVClient.ResolveLockLiteThreshold) + require.Equal(t, 120*time.Second, conf.TiKVClient.CoprReqTimeout) require.Equal(t, uint32(200), conf.Instance.MaxConnections) require.Equal(t, uint32(10), conf.TiDBMaxReuseChunk) require.Equal(t, uint32(20), conf.TiDBMaxReuseColumn) diff --git a/go.mod b/go.mod index 657ac348cdbbb..38eac34eab076 100644 --- a/go.mod +++ b/go.mod @@ -97,7 +97,7 @@ require ( github.com/stretchr/testify v1.8.4 github.com/tdakkota/asciicheck v0.2.0 github.com/tiancaiamao/appdash v0.0.0-20181126055449-889f96f722a2 - github.com/tikv/client-go/v2 v2.0.8-0.20230707070242-178f6fa01aab + github.com/tikv/client-go/v2 v2.0.8-0.20230711075855-e540aa3b9657 github.com/tikv/pd/client v0.0.0-20230613052906-7158cb319935 github.com/timakin/bodyclose v0.0.0-20230421092635-574207250966 github.com/twmb/murmur3 v1.1.6 diff --git a/go.sum b/go.sum index 6b7750883dc6d..4686f386c8b99 100644 --- a/go.sum +++ b/go.sum @@ -973,8 +973,8 @@ github.com/tiancaiamao/appdash v0.0.0-20181126055449-889f96f722a2 h1:mbAskLJ0oJf github.com/tiancaiamao/appdash v0.0.0-20181126055449-889f96f722a2/go.mod h1:2PfKggNGDuadAa0LElHrByyrz4JPZ9fFx6Gs7nx7ZZU= github.com/tiancaiamao/gp v0.0.0-20221230034425-4025bc8a4d4a h1:J/YdBZ46WKpXsxsW93SG+q0F8KI+yFrcIDT4c/RNoc4= github.com/tiancaiamao/gp v0.0.0-20221230034425-4025bc8a4d4a/go.mod h1:h4xBhSNtOeEosLJ4P7JyKXX7Cabg7AVkWCK5gV2vOrM= -github.com/tikv/client-go/v2 v2.0.8-0.20230707070242-178f6fa01aab h1:pLUQsFZGE3z7OlZddP+WHkb85rLoxPwRd8CknfSw804= -github.com/tikv/client-go/v2 v2.0.8-0.20230707070242-178f6fa01aab/go.mod h1:4KkKqjJgKlvvWMyNqdnAlYFfV4QjEj1fEb5Hb/FoT88= +github.com/tikv/client-go/v2 v2.0.8-0.20230711075855-e540aa3b9657 h1:wRqy8mHs5IocLn4pDvqrwGs4lc3wKhdDXxFyLi8kNbQ= +github.com/tikv/client-go/v2 v2.0.8-0.20230711075855-e540aa3b9657/go.mod h1:4KkKqjJgKlvvWMyNqdnAlYFfV4QjEj1fEb5Hb/FoT88= github.com/tikv/pd/client v0.0.0-20230613052906-7158cb319935 h1:a5SATBxu/0Z6qNnz4KXDN91gDA06waaYcHM6dkb6lz4= github.com/tikv/pd/client v0.0.0-20230613052906-7158cb319935/go.mod h1:YmNkj9UT8IjwFov9k3oquH0UgIUHniUaQT3jXKgZYbM= github.com/timakin/bodyclose v0.0.0-20230421092635-574207250966 h1:quvGphlmUVU+nhpFa4gg4yJyTRJ13reZMDHrKwYw53M= diff --git a/store/copr/coprocessor.go b/store/copr/coprocessor.go index b2ce336de6eb8..5c14f1e907764 100644 --- a/store/copr/coprocessor.go +++ b/store/copr/coprocessor.go @@ -33,6 +33,7 @@ import ( "github.com/pingcap/kvproto/pkg/errorpb" "github.com/pingcap/kvproto/pkg/kvrpcpb" "github.com/pingcap/kvproto/pkg/metapb" + "github.com/pingcap/tidb/config" "github.com/pingcap/tidb/domain/infosync" "github.com/pingcap/tidb/domain/resourcegroup" "github.com/pingcap/tidb/errno" @@ -1204,7 +1205,8 @@ func (worker *copIteratorWorker) handleTaskOnce(bo *Backoffer, task *copTask, ch req.ReplicaReadType = options.GetTiKVReplicaReadType(kv.ReplicaReadFollower) ops = append(ops, tikv.WithMatchStores([]uint64{*task.redirect2Replica})) } - resp, rpcCtx, storeAddr, err := worker.kvclient.SendReqCtx(bo.TiKVBackoffer(), req, task.region, tikv.ReadTimeoutMedium, getEndPointType(task.storeType), task.storeAddr, ops...) + resp, rpcCtx, storeAddr, err := worker.kvclient.SendReqCtx(bo.TiKVBackoffer(), req, task.region, + config.GetGlobalConfig().TiKVClient.CoprReqTimeout, getEndPointType(task.storeType), task.storeAddr, ops...) err = derr.ToTiDBErr(err) if err != nil { if task.storeType == kv.TiDB {