Merge pull request #1546 from unihorn/198

etcdserver: better logging for assign ids from upstream

etcdserver/cluster.go

@@ -230,7 +230,7 @@ func (c Cluster) String() string {
 // cluster. If the validation fails, an error will be returned.
 func (c *Cluster) ValidateAndAssignIDs(membs []*Member) error {
 	if len(c.members) != len(membs) {
-		return fmt.Errorf("cannot update %v from %v because the member count is unequal", c.members, membs)
+		return fmt.Errorf("member count is unequal")
 	}
 	omembs := make([]*Member, 0)
 	for _, m := range c.members {

etcdserver/server.go

@@ -192,7 +192,7 @@ func NewServer(cfg *ServerConfig) *EtcdServer {
 			log.Fatal(err)
 		}
 		if err := cfg.Cluster.ValidateAndAssignIDs(cl.Members()); err != nil {
-			log.Fatalf("etcdserver: %v", err)
+			log.Fatalf("etcdserver: error validating IDs from cluster %s: %v", cl, err)
 		}
 		cfg.Cluster.SetID(cl.id)
 		cfg.Cluster.SetStore(st)