From 3394b202da90564348a8c1694afdbcbd47989842 Mon Sep 17 00:00:00 2001 From: crazycs Date: Mon, 3 Jun 2024 10:46:24 +0800 Subject: [PATCH] *: fix issue of concurrent close batch client panic (#53728) close pingcap/tidb#53727 --- DEPS.bzl | 12 ++++++------ go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/DEPS.bzl b/DEPS.bzl index 357c5c05c2a9c..a2365ba69a2c7 100644 --- a/DEPS.bzl +++ b/DEPS.bzl @@ -7041,13 +7041,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 = "02e51a0a3f3737b365c2a16e7147c472b99ad1c48a285ba840b55a59d20cf729", - strip_prefix = "github.com/tikv/client-go/v2@v2.0.8-0.20240528025037-f41b068bf706", + sha256 = "48097286e81b799d8cc8612879e4d3fa569be79a1be93ed77131c04052c3a069", + strip_prefix = "github.com/tikv/client-go/v2@v2.0.8-0.20240531122021-7a74511a5241", urls = [ - "http://bazel-cache.pingcap.net:8080/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20240528025037-f41b068bf706.zip", - "http://ats.apps.svc/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20240528025037-f41b068bf706.zip", - "https://cache.hawkingrei.com/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20240528025037-f41b068bf706.zip", - "https://storage.googleapis.com/pingcapmirror/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20240528025037-f41b068bf706.zip", + "http://bazel-cache.pingcap.net:8080/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20240531122021-7a74511a5241.zip", + "http://ats.apps.svc/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20240531122021-7a74511a5241.zip", + "https://cache.hawkingrei.com/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20240531122021-7a74511a5241.zip", + "https://storage.googleapis.com/pingcapmirror/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20240531122021-7a74511a5241.zip", ], ) go_repository( diff --git a/go.mod b/go.mod index 9b272ed895558..c4063ebce5d8e 100644 --- a/go.mod +++ b/go.mod @@ -104,7 +104,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.20240528025037-f41b068bf706 + github.com/tikv/client-go/v2 v2.0.8-0.20240531122021-7a74511a5241 github.com/tikv/pd/client v0.0.0-20240528122050-634e05a87ee0 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 8251a7f5f257f..2dd67b631efa8 100644 --- a/go.sum +++ b/go.sum @@ -993,8 +993,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.20240528025037-f41b068bf706 h1:iBSnGZ9D4blKcfwUzl1mcv3E0Nfk8tPUm2SOu5+r19M= -github.com/tikv/client-go/v2 v2.0.8-0.20240528025037-f41b068bf706/go.mod h1:37p0ryKaieJbBpVDWnaPi2ZS6UFqkgpsemBLkGX2FvM= +github.com/tikv/client-go/v2 v2.0.8-0.20240531122021-7a74511a5241 h1:iwqchfXkd1pfUDSnCKxXAeaR7FzyHA+yRdr5PtTwvvg= +github.com/tikv/client-go/v2 v2.0.8-0.20240531122021-7a74511a5241/go.mod h1:37p0ryKaieJbBpVDWnaPi2ZS6UFqkgpsemBLkGX2FvM= github.com/tikv/pd/client v0.0.0-20240528122050-634e05a87ee0 h1:7Pn6IykTelkKVhdzj2kbrYxj8DTModJt+U+7HTeIb54= github.com/tikv/pd/client v0.0.0-20240528122050-634e05a87ee0/go.mod h1:AwjTSpM7CgAynYwB6qTG5R5fVC9/eXlQXiTO6zDL1HI= github.com/timakin/bodyclose v0.0.0-20230421092635-574207250966 h1:quvGphlmUVU+nhpFa4gg4yJyTRJ13reZMDHrKwYw53M=