Skip to content

Commit

Permalink
client-go: fetch the store min resolved_ts by pd api firstly (#43737) (
Browse files Browse the repository at this point in the history
  • Loading branch information
ti-chi-bot authored May 17, 2023
1 parent 0ed6643 commit 375e57b
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions DEPS.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -4164,8 +4164,8 @@ def go_deps():
name = "com_github_tikv_client_go_v2",
build_file_proto_mode = "disable_global",
importpath = "github.com/tikv/client-go/v2",
sum = "h1:q36HOSgfUyrmXNV6KcuqoD6Nqz8eNAZ44e54HxXc+TU=",
version = "v2.0.8-0.20230511054908-c946782286d2",
sum = "h1:Xu3sf5rKIqlkLzGjTs5IED6l6soJgZHHEyj5mapc42I=",
version = "v2.0.8-0.20230512034316-adb48afeef3e",
)
go_repository(
name = "com_github_tikv_pd",
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ require (
github.com/stretchr/testify v1.8.2
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.20230511054908-c946782286d2
github.com/tikv/client-go/v2 v2.0.8-0.20230512034316-adb48afeef3e
github.com/tikv/pd/client v0.0.0-20230419153320-f1d1a80feb95
github.com/timakin/bodyclose v0.0.0-20221125081123-e39cf3fc478e
github.com/twmb/murmur3 v1.1.6
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -955,8 +955,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.20230511054908-c946782286d2 h1:q36HOSgfUyrmXNV6KcuqoD6Nqz8eNAZ44e54HxXc+TU=
github.com/tikv/client-go/v2 v2.0.8-0.20230511054908-c946782286d2/go.mod h1:XgUt8nFfG23jaEPlF+rRVUwSjSE/Aozi0LYRWzt1ar8=
github.com/tikv/client-go/v2 v2.0.8-0.20230512034316-adb48afeef3e h1:Xu3sf5rKIqlkLzGjTs5IED6l6soJgZHHEyj5mapc42I=
github.com/tikv/client-go/v2 v2.0.8-0.20230512034316-adb48afeef3e/go.mod h1:XgUt8nFfG23jaEPlF+rRVUwSjSE/Aozi0LYRWzt1ar8=
github.com/tikv/pd/client v0.0.0-20230419153320-f1d1a80feb95 h1:177X/S43/qjxDyFq9CBB4Nts0nwLvjJFXzoav2XCUSA=
github.com/tikv/pd/client v0.0.0-20230419153320-f1d1a80feb95/go.mod h1:5vgcvO020ZCdMZkTrRdS/wFZQUab82BSfKE38T61ro0=
github.com/timakin/bodyclose v0.0.0-20221125081123-e39cf3fc478e h1:MV6KaVu/hzByHP0UvJ4HcMGE/8a6A4Rggc/0wx2AvJo=
Expand Down
2 changes: 1 addition & 1 deletion store/driver/tikv_driver.go
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ func (d TiKVDriver) OpenWithOptions(path string, options ...Option) (resStore kv
tikv.WithCodec(codec),
)

s, err = tikv.NewKVStore(uuid, pdClient, spkv, rpcClient)
s, err = tikv.NewKVStore(uuid, pdClient, spkv, rpcClient, tikv.WithPDHTTPClient(tlsConfig, etcdAddrs))
if err != nil {
return nil, errors.Trace(err)
}
Expand Down

0 comments on commit 375e57b

Please sign in to comment.