From a63b4ab3817988f388adf588af16eecf0430973b Mon Sep 17 00:00:00 2001 From: JmPotato Date: Wed, 16 Oct 2024 20:13:11 +0800 Subject: [PATCH] This is an automated cherry-pick of #56679 Signed-off-by: ti-chi-bot --- DEPS.bzl | 12 ++++++------ go.mod | 5 +++++ go.sum | 7 +++++++ 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/DEPS.bzl b/DEPS.bzl index 7933fba5a3b00..f7ff6ba60cee3 100644 --- a/DEPS.bzl +++ b/DEPS.bzl @@ -6946,13 +6946,13 @@ def go_deps(): name = "com_github_tikv_pd_client", build_file_proto_mode = "disable_global", importpath = "github.com/tikv/pd/client", - sha256 = "ddfcb88a8b79c238b08c15c88f8142211cb9f64435c5ad371f682d8c81c8cc42", - strip_prefix = "github.com/tikv/pd/client@v0.0.0-20240926021936-642f0e919b0d", + sha256 = "da76c552e8a9cfcc707d462d7cdc1ea6bea4b8e9017a60fc0a23200db500978d", + strip_prefix = "github.com/tikv/pd/client@v0.0.0-20241016064947-b70107ec31e6", urls = [ - "http://bazel-cache.pingcap.net:8080/gomod/github.com/tikv/pd/client/com_github_tikv_pd_client-v0.0.0-20240926021936-642f0e919b0d.zip", - "http://ats.apps.svc/gomod/github.com/tikv/pd/client/com_github_tikv_pd_client-v0.0.0-20240926021936-642f0e919b0d.zip", - "https://cache.hawkingrei.com/gomod/github.com/tikv/pd/client/com_github_tikv_pd_client-v0.0.0-20240926021936-642f0e919b0d.zip", - "https://storage.googleapis.com/pingcapmirror/gomod/github.com/tikv/pd/client/com_github_tikv_pd_client-v0.0.0-20240926021936-642f0e919b0d.zip", + "http://bazel-cache.pingcap.net:8080/gomod/github.com/tikv/pd/client/com_github_tikv_pd_client-v0.0.0-20241016064947-b70107ec31e6.zip", + "http://ats.apps.svc/gomod/github.com/tikv/pd/client/com_github_tikv_pd_client-v0.0.0-20241016064947-b70107ec31e6.zip", + "https://cache.hawkingrei.com/gomod/github.com/tikv/pd/client/com_github_tikv_pd_client-v0.0.0-20241016064947-b70107ec31e6.zip", + "https://storage.googleapis.com/pingcapmirror/gomod/github.com/tikv/pd/client/com_github_tikv_pd_client-v0.0.0-20241016064947-b70107ec31e6.zip", ], ) go_repository( diff --git a/go.mod b/go.mod index fb8007adf49c9..cdc8906d8c686 100644 --- a/go.mod +++ b/go.mod @@ -108,8 +108,13 @@ require ( github.com/tdakkota/asciicheck v0.2.0 github.com/tiancaiamao/appdash v0.0.0-20181126055449-889f96f722a2 github.com/tidwall/btree v1.7.0 +<<<<<<< HEAD github.com/tikv/client-go/v2 v2.0.8-0.20241008085809-c3e10ae7c8fc github.com/tikv/pd/client v0.0.0-20240926021936-642f0e919b0d +======= + github.com/tikv/client-go/v2 v2.0.8-0.20241015065014-8dfa86b5d1db + github.com/tikv/pd/client v0.0.0-20241016064947-b70107ec31e6 +>>>>>>> ff317ee46d6 (go.mod: update PD client to fix TSO follower proxy switch (#56679)) github.com/timakin/bodyclose v0.0.0-20240125160201-f835fa56326a github.com/twmb/murmur3 v1.1.6 github.com/uber/jaeger-client-go v2.22.1+incompatible diff --git a/go.sum b/go.sum index 8d35d15e02bfc..bde68600c87cc 100644 --- a/go.sum +++ b/go.sum @@ -822,10 +822,17 @@ 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= +<<<<<<< HEAD github.com/tikv/client-go/v2 v2.0.8-0.20241008085809-c3e10ae7c8fc h1:07m9V+2BT06XC/P72EuM3tnlB6xJ6hTHNCju/x1Tfzg= github.com/tikv/client-go/v2 v2.0.8-0.20241008085809-c3e10ae7c8fc/go.mod h1:JZq2+O34RjrronQ9+sSrnPuUT0BHFMjayg11Sosi1JY= github.com/tikv/pd/client v0.0.0-20240926021936-642f0e919b0d h1:iBIi3+grJWLNI5c7BLVezgOonYtL/EQqSUDsPVK2kUw= github.com/tikv/pd/client v0.0.0-20240926021936-642f0e919b0d/go.mod h1:uBHhxAM/SPCMabt483gI/pN/+JXIMKYXohK96s+PwT8= +======= +github.com/tikv/client-go/v2 v2.0.8-0.20241015065014-8dfa86b5d1db h1:7K6a7IcYNuwST/3j7HNBC3MWREOD8ilRnwW+PdDsXLI= +github.com/tikv/client-go/v2 v2.0.8-0.20241015065014-8dfa86b5d1db/go.mod h1:WAp0oZxDL+3GX+QhJdG0quubJUzEH8LrFofmIxleJhs= +github.com/tikv/pd/client v0.0.0-20241016064947-b70107ec31e6 h1:u0z6yR68sg0pextuabJv/bD4mvwBe8iFeQOdymBUy0E= +github.com/tikv/pd/client v0.0.0-20241016064947-b70107ec31e6/go.mod h1:W5a0sDadwUpI9k8p7M77d3jo253ZHdmua+u4Ho4Xw8U= +>>>>>>> ff317ee46d6 (go.mod: update PD client to fix TSO follower proxy switch (#56679)) github.com/timakin/bodyclose v0.0.0-20240125160201-f835fa56326a h1:A6uKudFIfAEpoPdaal3aSqGxBzLyU8TqyXImLwo6dIo= github.com/timakin/bodyclose v0.0.0-20240125160201-f835fa56326a/go.mod h1:mkjARE7Yr8qU23YcGMSALbIxTQ9r9QBVahQOBRfU460= github.com/tklauser/go-sysconf v0.3.9/go.mod h1:11DU/5sG7UexIrp/O6g35hrWzu0JxlwQ3LSFUzyeuhs=