Skip to content

Commit e3670ab

Browse files
committed
u
Signed-off-by: gengliqi <gengliqiii@gmail.com>
1 parent 42727ee commit e3670ab

4 files changed

Lines changed: 20 additions & 12 deletions

File tree

DEPS.bzl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7792,13 +7792,13 @@ def go_deps():
77927792
build_tags = ["nextgen", "intest"],
77937793
build_file_proto_mode = "disable_global",
77947794
importpath = "github.com/tikv/client-go/v2",
7795-
sha256 = "3114edf037263d32c86a2813d7fdd4f5b21f4f9bca89b85e9e202c5a707a303b",
7796-
strip_prefix = "github.com/gengliqi/client-go/v2@v2.0.1-0.20260510122619-983e38f8baf2",
7795+
sha256 = "c141a99a743835252241ccc913861f671f4aec654e4c5c1920ab1bdf4c3586b7",
7796+
strip_prefix = "github.com/tikv/client-go/v2@v2.0.8-0.20260511022933-fb7ee09992a7",
77977797
urls = [
7798-
"http://bazel-cache.pingcap.net:8080/gomod/github.com/gengliqi/client-go/v2/com_github_gengliqi_client_go_v2-v2.0.1-0.20260510122619-983e38f8baf2.zip",
7799-
"http://ats.apps.svc/gomod/github.com/gengliqi/client-go/v2/com_github_gengliqi_client_go_v2-v2.0.1-0.20260510122619-983e38f8baf2.zip",
7800-
"https://cache.hawkingrei.com/gomod/github.com/gengliqi/client-go/v2/com_github_gengliqi_client_go_v2-v2.0.1-0.20260510122619-983e38f8baf2.zip",
7801-
"https://storage.googleapis.com/pingcapmirror/gomod/github.com/gengliqi/client-go/v2/com_github_gengliqi_client_go_v2-v2.0.1-0.20260510122619-983e38f8baf2.zip",
7798+
"http://bazel-cache.pingcap.net:8080/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20260511022933-fb7ee09992a7.zip",
7799+
"http://ats.apps.svc/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20260511022933-fb7ee09992a7.zip",
7800+
"https://cache.hawkingrei.com/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20260511022933-fb7ee09992a7.zip",
7801+
"https://storage.googleapis.com/pingcapmirror/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20260511022933-fb7ee09992a7.zip",
78027802
],
78037803
)
78047804
go_repository(

go.mod

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ require (
123123
github.com/stathat/consistent v1.0.0
124124
github.com/stretchr/testify v1.11.1
125125
github.com/tiancaiamao/appdash v0.0.0-20181126055449-889f96f722a2
126-
github.com/tikv/client-go/v2 v2.0.8-0.20260423085316-fce9638195b3
126+
github.com/tikv/client-go/v2 v2.0.8-0.20260511022933-fb7ee09992a7
127127
github.com/tikv/pd/client v0.0.0-20260404141330-8a6813497b52
128128
github.com/timakin/bodyclose v0.0.0-20241222091800-1db5c5ca4d67
129129
github.com/twmb/murmur3 v1.1.6
@@ -373,5 +373,3 @@ replace (
373373
sourcegraph.com/sourcegraph/appdash => github.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0
374374
sourcegraph.com/sourcegraph/appdash-data => github.com/sourcegraph/appdash-data v0.0.0-20151005221446-73f23eafcf67
375375
)
376-
377-
replace github.com/tikv/client-go/v2 => github.com/gengliqi/client-go/v2 v2.0.1-0.20260510122619-983e38f8baf2

go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -895,6 +895,8 @@ github.com/tidwall/pretty v1.2.1 h1:qjsOFOWWQl+N3RsoF5/ssm1pHmJJwhjlSbZ51I6wMl4=
895895
github.com/tidwall/pretty v1.2.1/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
896896
github.com/tidwall/sjson v1.2.5 h1:kLy8mja+1c9jlljvWTlSazM7cKDRfJuR/bOJhcY5NcY=
897897
github.com/tidwall/sjson v1.2.5/go.mod h1:Fvgq9kS/6ociJEDnK0Fk1cpYF4FIW6ZF7LAe+6jwd28=
898+
github.com/tikv/client-go/v2 v2.0.8-0.20260511022933-fb7ee09992a7 h1:DOYEd6c0WkPDO1RYIKVCEj771r8NGP5w9CWnOXIP7IU=
899+
github.com/tikv/client-go/v2 v2.0.8-0.20260511022933-fb7ee09992a7/go.mod h1:rg9c3yf9lfQdj9rt5FvwRP9xDubUY6C9hyH4g9zFH1s=
898900
github.com/tikv/pd/client v0.0.0-20260404141330-8a6813497b52 h1:fXIMowblD3qdfHXJYGJpe7SbBlTO4S9GPVZZvL3CPG8=
899901
github.com/tikv/pd/client v0.0.0-20260404141330-8a6813497b52/go.mod h1:I2yRx/Yf8Y8kgM5f3VNp4a8fWpnjPC4TxWk554AY8bM=
900902
github.com/timakin/bodyclose v0.0.0-20241222091800-1db5c5ca4d67 h1:9LPGD+jzxMlnk5r6+hJnar67cgpDIz/iyD+rfl5r2Vk=

pkg/store/copr/batch_coprocessor.go

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -964,7 +964,7 @@ func buildBatchCopTasksCore(bo *backoff.Backoffer, store *kvStore, rangesForEach
964964
var needRetry bool
965965
minReplicaNum := uint64(math.MaxUint64)
966966
for _, task := range tasks {
967-
rpcCtx, unavailableReason, err := cache.GetTiFlashRPCContext(bo.TiKVBackoffer(), task.region, isMPP, tikv.LabelFilterNoTiFlashWriteNode)
967+
rpcCtx, unavailableDetail, err := cache.GetTiFlashRPCContext(bo.TiKVBackoffer(), task.region, isMPP, tikv.LabelFilterNoTiFlashWriteNode)
968968
if err != nil {
969969
return nil, errors.Trace(err)
970970
}
@@ -975,9 +975,17 @@ func buildBatchCopTasksCore(bo *backoff.Backoffer, store *kvStore, rangesForEach
975975
// same as rpc error.
976976
if rpcCtx == nil {
977977
needRetry = true
978-
logutil.BgLogger().Info("retry for TiFlash peer with region missing",
978+
fields := []zap.Field{
979979
zap.Uint64("region id", task.region.GetID()),
980-
zap.String("reason", unavailableReason.String()))
980+
zap.String("reason", unavailableDetail.Reason.String()),
981+
}
982+
if len(unavailableDetail.StoreIDs) > 0 {
983+
fields = append(fields, zap.Uint64s("store_ids", unavailableDetail.StoreIDs))
984+
}
985+
if len(unavailableDetail.PeerIDs) > 0 {
986+
fields = append(fields, zap.Uint64s("peer_ids", unavailableDetail.PeerIDs))
987+
}
988+
logutil.BgLogger().Info("retry for TiFlash peer with region missing", fields...)
981989
// Probably all the regions are invalid. Make the loop continue and mark all the regions invalid.
982990
// Then `splitRegion` will reloads these regions.
983991
continue

0 commit comments

Comments
 (0)