store/tikv: upgrade pd-client. (#4694)

This commit is contained in:
disksing
2017-09-30 02:18:20 -05:00
committed by tiancaiamao
parent 883b9aea5d
commit f40b63fcee
3 changed files with 11 additions and 4 deletions

View File

@ -121,11 +121,17 @@ func NewClient(pdAddrs []string) (Client, error) {
go c.tsCancelLoop()
go c.leaderLoop()
// TODO: Update addrs from server continuously by using GetMember.
return c, nil
}
func (c *client) updateURLs(members []*pdpb.Member) {
urls := make([]string, 0, len(members))
for _, m := range members {
urls = append(urls, m.GetClientUrls()...)
}
c.urls = urls
}
func (c *client) initClusterID() error {
ctx, cancel := context.WithCancel(c.ctx)
defer cancel()
@ -154,6 +160,7 @@ func (c *client) updateLeader() error {
if err != nil || members.GetLeader() == nil || len(members.GetLeader().GetClientUrls()) == 0 {
continue
}
c.updateURLs(members.GetMembers())
if err = c.switchLeader(members.GetLeader().GetClientUrls()); err != nil {
return errors.Trace(err)
}

2
glide.lock generated
View File

@ -132,7 +132,7 @@ imports:
- pkg/raft_serverpb
- pkg/tikvpb
- name: github.com/pingcap/pd
version: 38eb8a2e70dd39668a62d24a79f30596f204df14
version: 91e4257196bb714005f80a6e075bc1e19a9687b1
subpackages:
- pd-client
- pkg/logutil

View File

@ -140,7 +140,7 @@ import:
subpackages:
- lex
- package: github.com/pingcap/pd
version: 38eb8a2e70dd39668a62d24a79f30596f204df14
version: 91e4257196bb714005f80a6e075bc1e19a9687b1
- package: github.com/pingcap/tipb
version: 0edd80335ab0c044ddcd9de57b63026ab7a209fa
subpackages: