From f40b63fceeaf4aa604dc50bcb2760281f7eb37d1 Mon Sep 17 00:00:00 2001
From: disksing <i@disksing.com>
Date: Sat, 30 Sep 2017 02:18:20 -0500
Subject: [PATCH] store/tikv: upgrade pd-client. (#4694)

---
 _vendor/src/github.com/pingcap/pd/pd-client/client.go | 11 +++++++++--
 glide.lock                                            |  2 +-
 glide.yaml                                            |  2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/_vendor/src/github.com/pingcap/pd/pd-client/client.go b/_vendor/src/github.com/pingcap/pd/pd-client/client.go
index 7c0a1ce1ed..e87e058344 100644
--- a/_vendor/src/github.com/pingcap/pd/pd-client/client.go
+++ b/_vendor/src/github.com/pingcap/pd/pd-client/client.go
@@ -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)
 		}
diff --git a/glide.lock b/glide.lock
index 01710b5ee2..d6969b138b 100644
--- a/glide.lock
+++ b/glide.lock
@@ -132,7 +132,7 @@ imports:
   - pkg/raft_serverpb
   - pkg/tikvpb
 - name: github.com/pingcap/pd
-  version: 38eb8a2e70dd39668a62d24a79f30596f204df14
+  version: 91e4257196bb714005f80a6e075bc1e19a9687b1
   subpackages:
   - pd-client
   - pkg/logutil
diff --git a/glide.yaml b/glide.yaml
index 843833ed89..6c79b3072d 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -140,7 +140,7 @@ import:
   subpackages:
   - lex
 - package: github.com/pingcap/pd
-  version: 38eb8a2e70dd39668a62d24a79f30596f204df14
+  version: 91e4257196bb714005f80a6e075bc1e19a9687b1
 - package: github.com/pingcap/tipb
   version: 0edd80335ab0c044ddcd9de57b63026ab7a209fa
   subpackages: