diff --git a/Gopkg.lock b/Gopkg.lock index d5adffb288c28..68b4329b332ee 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -298,7 +298,7 @@ revision = "eb892dda1e33a0b76191d39894ad4a806f313f6e" [[projects]] - digest = "1:ef1a3a4694f068c0f914a809fbfa48e0a44d50dc1154d72e85b15be01facda23" + digest = "1:09802a4b5acb491d99be650e2c64115de817ff7b588ffd2cb016f3ca1f9c61aa" name = "github.com/pingcap/tidb-tools" packages = [ "pkg/etcd", @@ -307,7 +307,7 @@ "tidb-binlog/pump_client", ] pruneopts = "NUT" - revision = "5db58e3b7e6613456551c40d011806a346b2f44a" + revision = "8dd71127bcf09130ae032ab6877dd22f32b53e14" [[projects]] branch = "master" diff --git a/Gopkg.toml b/Gopkg.toml index 4ffa13e39d08d..b04b1587e98dd 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -105,4 +105,4 @@ required = ["github.com/golang/protobuf/jsonpb"] [[constraint]] name = "github.com/pingcap/tidb-tools" - revision = "5db58e3b7e6613456551c40d011806a346b2f44a" + revision = "8dd71127bcf09130ae032ab6877dd22f32b53e14" diff --git a/vendor/github.com/pingcap/tidb-tools/tidb-binlog/pump_client/client.go b/vendor/github.com/pingcap/tidb-tools/tidb-binlog/pump_client/client.go index 192ef1a5be7b1..da7cf3d9fa106 100644 --- a/vendor/github.com/pingcap/tidb-tools/tidb-binlog/pump_client/client.go +++ b/vendor/github.com/pingcap/tidb-tools/tidb-binlog/pump_client/client.go @@ -125,8 +125,7 @@ func NewPumpsClient(etcdURLs string, timeout time.Duration, securityOpt pd.Secur return nil, errors.Trace(err) } - rootPath := path.Join(node.DefaultRootPath, node.NodePrefix[node.PumpNode]) - cli, err := etcd.NewClientFromCfg(ectdEndpoints, DefaultEtcdTimeout, rootPath, security) + cli, err := etcd.NewClientFromCfg(ectdEndpoints, DefaultEtcdTimeout, node.DefaultRootPath, security) if err != nil { return nil, errors.Trace(err) } @@ -165,7 +164,7 @@ func NewPumpsClient(etcdURLs string, timeout time.Duration, securityOpt pd.Secur // getPumpStatus retruns all the pumps status in the etcd. func (c *PumpsClient) getPumpStatus(pctx context.Context) error { - nodesStatus, err := c.EtcdRegistry.Nodes(pctx, node.DefaultRootPath) + nodesStatus, err := c.EtcdRegistry.Nodes(pctx, node.NodePrefix[node.PumpNode]) if err != nil { return errors.Trace(err) }