*: update client-go to improve availability on tikv failure (#35561)

close #34906
pingcap · Jun 22, 2022 · d4b5838 · d4b5838
1 parent 4d888ce
commit d4b5838
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/executor/main_test.go b/executor/main_test.go
@@ -19,6 +19,7 @@ import (
 	"os"
 	"testing"
 
+	"github.com/pingcap/failpoint"
 	"github.com/pingcap/tidb/config"
 	"github.com/pingcap/tidb/meta/autoid"
 	"github.com/pingcap/tidb/testkit"
@@ -49,6 +50,8 @@ func TestMain(m *testing.M) {
 		conf.Experimental.AllowsExpressionIndex = true
 	})
 	tikv.EnableFailpoints()
+	failpoint.Enable("tikvclient/injectLiveness", `return("reachable")`)
+	defer failpoint.Disable("tikvclient/injectLiveness")
 	tmpDir := config.GetGlobalConfig().TempStoragePath
 	_ = os.RemoveAll(tmpDir) // clean the uncleared temp file during the last run.
 	_ = os.MkdirAll(tmpDir, 0755)

diff --git a/go.mod b/go.mod
@@ -70,7 +70,7 @@ require (
 	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.7.0
 	github.com/tiancaiamao/appdash v0.0.0-20181126055449-889f96f722a2
-	github.com/tikv/client-go/v2 v2.0.0-rc.0.20220516035110-cf67df00ad4b
+	github.com/tikv/client-go/v2 v2.0.0-rc.0.20220614073512-c9d27cd5a9a3
 	github.com/tikv/pd v1.1.0-beta.0.20211118054146-02848d2660ee
 	github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802 // indirect
 	github.com/twmb/murmur3 v1.1.3

diff --git a/go.sum b/go.sum
@@ -789,8 +789,8 @@ github.com/tiancaiamao/appdash v0.0.0-20181126055449-889f96f722a2/go.mod h1:2PfK
 github.com/tidwall/gjson v1.3.5/go.mod h1:P256ACg0Mn+j1RXIDXoss50DeIABTYK1PULOJHhxOls=
 github.com/tidwall/match v1.0.1/go.mod h1:LujAq0jyVjBy028G1WhWfIzbpQfMO8bBZ6Tyb0+pL9E=
 github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
-github.com/tikv/client-go/v2 v2.0.0-rc.0.20220516035110-cf67df00ad4b h1:ED0XsC7KV6SA59OLaZDrTrkMrq4g4RTjtnjgXuL5WrY=
-github.com/tikv/client-go/v2 v2.0.0-rc.0.20220516035110-cf67df00ad4b/go.mod h1:wRuh+W35daKTiYBld0oBlT6PSkzEVr+pB/vChzJZk+8=
+github.com/tikv/client-go/v2 v2.0.0-rc.0.20220614073512-c9d27cd5a9a3 h1:3hz+Knhrreu+lW/bV8FEdZKZXxW5WAVXhMsFiT5gFvo=
+github.com/tikv/client-go/v2 v2.0.0-rc.0.20220614073512-c9d27cd5a9a3/go.mod h1:wRuh+W35daKTiYBld0oBlT6PSkzEVr+pB/vChzJZk+8=
 github.com/tikv/pd v1.1.0-beta.0.20211029083450-e65f0c55b6ae/go.mod h1:varH0IE0jJ9E9WN2Ei/N6pajMlPkcXdDEf7f5mmsUVQ=
 github.com/tikv/pd v1.1.0-beta.0.20211118054146-02848d2660ee h1:rAAdvQ8Hh36syHr92g0VmZEpkH+40RGQBpFL2121xMs=
 github.com/tikv/pd v1.1.0-beta.0.20211118054146-02848d2660ee/go.mod h1:lRbwxBAhnTQR5vqbTzeI/Bj62bD2OvYYuFezo2vrmeI=