From 5aee8df9c3a43a876162c331fe5fdc702e64c4ac Mon Sep 17 00:00:00 2001 From: crazycs520 Date: Wed, 31 Jul 2024 16:24:41 +0800 Subject: [PATCH 1/2] *: update tikv/client-go for fix rpc client panic cause by concurrent close Signed-off-by: crazycs520 --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 6be6868fa35e8..3663d80e78b1f 100644 --- a/go.mod +++ b/go.mod @@ -106,7 +106,7 @@ require ( github.com/tdakkota/asciicheck v0.2.0 github.com/tiancaiamao/appdash v0.0.0-20181126055449-889f96f722a2 github.com/tidwall/btree v1.7.0 - github.com/tikv/client-go/v2 v2.0.8-0.20240731053457-1528f10383b2 + github.com/tikv/client-go/v2 v2.0.8-0.20240731082154-05c2c6641a7c github.com/tikv/pd/client v0.0.0-20240725040006-f1a90966c375 github.com/timakin/bodyclose v0.0.0-20240125160201-f835fa56326a github.com/twmb/murmur3 v1.1.6 diff --git a/go.sum b/go.sum index 2df9059ac329c..8221472a570c5 100644 --- a/go.sum +++ b/go.sum @@ -867,8 +867,8 @@ github.com/tiancaiamao/gp v0.0.0-20221230034425-4025bc8a4d4a h1:J/YdBZ46WKpXsxsW github.com/tiancaiamao/gp v0.0.0-20221230034425-4025bc8a4d4a/go.mod h1:h4xBhSNtOeEosLJ4P7JyKXX7Cabg7AVkWCK5gV2vOrM= github.com/tidwall/btree v1.7.0 h1:L1fkJH/AuEh5zBnnBbmTwQ5Lt+bRJ5A8EWecslvo9iI= github.com/tidwall/btree v1.7.0/go.mod h1:twD9XRA5jj9VUQGELzDO4HPQTNJsoWWfYEL+EUQ2cKY= -github.com/tikv/client-go/v2 v2.0.8-0.20240731053457-1528f10383b2 h1:UqMZgQeAHida1RxjdRjk+Jto0fWb0wq8Izlt3TDPA1Q= -github.com/tikv/client-go/v2 v2.0.8-0.20240731053457-1528f10383b2/go.mod h1:+vXk4Aex17GnI8gfSMPxrL0SQLbBYgP3Db4FvHiImwM= +github.com/tikv/client-go/v2 v2.0.8-0.20240731082154-05c2c6641a7c h1:8kbzM9W8SsBaM3MlJD2RdQ/CcQ299KMJplScnzyNiEQ= +github.com/tikv/client-go/v2 v2.0.8-0.20240731082154-05c2c6641a7c/go.mod h1:+vXk4Aex17GnI8gfSMPxrL0SQLbBYgP3Db4FvHiImwM= github.com/tikv/pd/client v0.0.0-20240725040006-f1a90966c375 h1:I5UeNdxggvuyLT8xuzZiODvuw4uFDdi/R280DprOzLs= github.com/tikv/pd/client v0.0.0-20240725040006-f1a90966c375/go.mod h1:4HXfGoT4O+lOWfOqxOvsIca9v+sYRL/W35duf+rgRsY= github.com/timakin/bodyclose v0.0.0-20240125160201-f835fa56326a h1:A6uKudFIfAEpoPdaal3aSqGxBzLyU8TqyXImLwo6dIo= From 18e89029cd109667502f8df9e0aa5cf24e7f539b Mon Sep 17 00:00:00 2001 From: crazycs520 Date: Wed, 31 Jul 2024 16:27:28 +0800 Subject: [PATCH 2/2] make bazel_prepare Signed-off-by: crazycs520 --- DEPS.bzl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/DEPS.bzl b/DEPS.bzl index 2102a85c088fa..ad0ff27dc056a 100644 --- a/DEPS.bzl +++ b/DEPS.bzl @@ -7067,13 +7067,13 @@ def go_deps(): name = "com_github_tikv_client_go_v2", build_file_proto_mode = "disable_global", importpath = "github.com/tikv/client-go/v2", - sha256 = "664e6a5015c3e8a03487a8ed98abcfce3455b33ffe7b66fd6d4b90edafc685f5", - strip_prefix = "github.com/tikv/client-go/v2@v2.0.8-0.20240731053457-1528f10383b2", + sha256 = "944aac8d5c6f85c45028d1e1d9bfab6c1a8bdafac7673129e9c3c1a44fb05e34", + strip_prefix = "github.com/tikv/client-go/v2@v2.0.8-0.20240731082154-05c2c6641a7c", urls = [ - "http://bazel-cache.pingcap.net:8080/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20240731053457-1528f10383b2.zip", - "http://ats.apps.svc/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20240731053457-1528f10383b2.zip", - "https://cache.hawkingrei.com/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20240731053457-1528f10383b2.zip", - "https://storage.googleapis.com/pingcapmirror/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20240731053457-1528f10383b2.zip", + "http://bazel-cache.pingcap.net:8080/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20240731082154-05c2c6641a7c.zip", + "http://ats.apps.svc/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20240731082154-05c2c6641a7c.zip", + "https://cache.hawkingrei.com/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20240731082154-05c2c6641a7c.zip", + "https://storage.googleapis.com/pingcapmirror/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20240731082154-05c2c6641a7c.zip", ], ) go_repository(