Skip to content

Commit c82570c

Browse files
authored
Log Backup: decouple log backup resolve locks from GCWorker. (#45904) (#46894)
close #40759
1 parent d121f46 commit c82570c

File tree

14 files changed

+641
-425
lines changed

14 files changed

+641
-425
lines changed

DEPS.bzl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4171,8 +4171,8 @@ def go_deps():
41714171
name = "com_github_tikv_client_go_v2",
41724172
build_file_proto_mode = "disable_global",
41734173
importpath = "github.com/tikv/client-go/v2",
4174-
sum = "h1:+HhD1RtDBTiWo5ROyV0vSAmbW2rcK+A8iLjb5RNJRBI=",
4175-
version = "v2.0.8-0.20230831062137-ddb89d56a55e",
4174+
sum = "h1:7kZN3rFidhh41sQwBLmg4RM5+ntHAhWFKCfinaBpFCQ=",
4175+
version = "v2.0.8-0.20230918072237-01087502b780",
41764176
)
41774177
go_repository(
41784178
name = "com_github_tikv_pd",

br/pkg/conn/conn.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -245,6 +245,11 @@ func (mgr *Mgr) GetTLSConfig() *tls.Config {
245245
return mgr.StoreManager.TLSConfig()
246246
}
247247

248+
// GetStore gets the tikvStore.
249+
func (mgr *Mgr) GetStore() tikv.Storage {
250+
return mgr.tikvStore
251+
}
252+
248253
// GetLockResolver gets the LockResolver.
249254
func (mgr *Mgr) GetLockResolver() *txnlock.LockResolver {
250255
return mgr.tikvStore.GetLockResolver()

br/pkg/streamhelper/BUILD.bazel

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,9 @@ go_library(
4141
"@com_github_pingcap_log//:log",
4242
"@com_github_tikv_client_go_v2//kv",
4343
"@com_github_tikv_client_go_v2//oracle",
44+
"@com_github_tikv_client_go_v2//tikv",
45+
"@com_github_tikv_client_go_v2//txnkv/rangetask",
46+
"@com_github_tikv_client_go_v2//txnkv/txnlock",
4447
"@com_github_tikv_pd_client//:client",
4548
"@io_etcd_go_etcd_client_v3//:client",
4649
"@org_golang_google_grpc//:grpc",
@@ -65,7 +68,7 @@ go_test(
6568
],
6669
flaky = True,
6770
race = "on",
68-
shard_count = 18,
71+
shard_count = 19,
6972
deps = [
7073
":streamhelper",
7174
"//br/pkg/errors",
@@ -82,18 +85,24 @@ go_test(
8285
"@com_github_pingcap_failpoint//:failpoint",
8386
"@com_github_pingcap_kvproto//pkg/brpb",
8487
"@com_github_pingcap_kvproto//pkg/errorpb",
88+
"@com_github_pingcap_kvproto//pkg/kvrpcpb",
8589
"@com_github_pingcap_kvproto//pkg/logbackuppb",
8690
"@com_github_pingcap_kvproto//pkg/metapb",
8791
"@com_github_pingcap_log//:log",
8892
"@com_github_stretchr_testify//require",
8993
"@com_github_tikv_client_go_v2//kv",
94+
"@com_github_tikv_client_go_v2//tikv",
95+
"@com_github_tikv_client_go_v2//tikvrpc",
96+
"@com_github_tikv_client_go_v2//txnkv/txnlock",
97+
"@com_github_tikv_pd_client//:client",
9098
"@io_etcd_go_etcd_client_v3//:client",
9199
"@io_etcd_go_etcd_server_v3//embed",
92100
"@io_etcd_go_etcd_server_v3//mvcc",
93101
"@org_golang_google_grpc//:grpc",
94102
"@org_golang_google_grpc//codes",
95103
"@org_golang_google_grpc//metadata",
96104
"@org_golang_google_grpc//status",
105+
"@org_uber_go_atomic//:atomic",
97106
"@org_uber_go_zap//:zap",
98107
"@org_uber_go_zap//zapcore",
99108
],

0 commit comments

Comments
 (0)