etcdserver: add detailed errors in "ValidateClusterAndAssignIDs"

gyuho · gyuho · commit ce45c83f29a9 · 2018-01-25T11:22:10.000-08:00
Signed-off-by: Gyuho Lee &lt;gyuhox@gmail.com&gt;
diff --git a/etcdserver/membership/cluster.go b/etcdserver/membership/cluster.go
@@ -490,8 +490,8 @@ func ValidateClusterAndAssignIDs(local *RaftCluster, existing *RaftCluster) erro
 	ctx, cancel := context.WithTimeout(context.TODO(), 30*time.Second)
 	defer cancel()
 	for i := range ems {
-		if !netutil.URLStringsEqual(ctx, ems[i].PeerURLs, lms[i].PeerURLs) {
-			return fmt.Errorf("unmatched member while checking PeerURLs")
+		if ok, err := netutil.URLStringsEqual(ctx, ems[i].PeerURLs, lms[i].PeerURLs); !ok {
+			return fmt.Errorf("unmatched member while checking PeerURLs (%v)", err)
 		}
 		lms[i].ID = ems[i].ID
 	}

Original file line number	Diff line number	Diff line change
`@@ -490,8 +490,8 @@ func ValidateClusterAndAssignIDs(local RaftCluster, existing RaftCluster) erro`
`490`	`490`	`ctx, cancel := context.WithTimeout(context.TODO(), 30*time.Second)`
`491`	`491`	`defer cancel()`
`492`	`492`	`for i := range ems {`
`493`		`- if !netutil.URLStringsEqual(ctx, ems[i].PeerURLs, lms[i].PeerURLs) {`
`494`		`- return fmt.Errorf("unmatched member while checking PeerURLs")`
	`493`	`+ if ok, err := netutil.URLStringsEqual(ctx, ems[i].PeerURLs, lms[i].PeerURLs); !ok {`
	`494`	`+ return fmt.Errorf("unmatched member while checking PeerURLs (%v)", err)`
`495`	`495`	`}`
`496`	`496`	`lms[i].ID = ems[i].ID`
`497`	`497`	`}`