vendor: update pd-client (pingcap#2231)

bo11zhou · Dec 13, 2016 · 2c7ca81 · 2c7ca81
1 parent c30849a
commit 2c7ca81
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/_vendor/src/github.com/pingcap/pd/pd-client/rpc_worker.go b/_vendor/src/github.com/pingcap/pd/pd-client/rpc_worker.go
@@ -219,18 +219,21 @@ func newMsgID() uint64 {
 }
 
 func (w *rpcWorker) initClusterID() error {
-	conn := mustNewConn(w.urls, w.quit)
-	if conn == nil {
-		return errors.New("client closed")
-	}
-	defer conn.Close()
-
 	for i := 0; i < maxInitClusterRetries; i++ {
+		conn := mustNewConn(w.urls, w.quit)
+		if conn == nil {
+			return errors.New("client closed")
+		}
+
 		clusterID, err := w.getClusterID(conn.ReadWriter)
+		// We need to close this connection no matter success or not.
+		conn.Close()
+
 		if err == nil {
 			w.clusterID = clusterID
 			return nil
 		}
+
 		log.Errorf("[pd] failed to get cluster id: %v", err)
 		time.Sleep(time.Second)
 	}

diff --git a/glide.lock b/glide.lock
diff --git a/glide.yaml b/glide.yaml
@@ -140,7 +140,7 @@ import:
   subpackages:
   - lex
 - package: github.com/pingcap/pd
-  version: e3fdded938ceabe4f6297442e8d179f1d40a9ff4
+  version: 3d5bb2b3a056925b656d29b88a5b216f6f309368
 - package: github.com/pingcap/tipb
   version: 7be8865936fd4dfee0591913c31c07be11da5d19
   subpackages: