vitalif
/
etcd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

etcdserver: better logging for assign ids from upstream

release-2.0
Yicheng Qin 2014-10-30 23:35:16 -07:00
parent 781abc1db0
commit 2c5f062b7f
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etcdserver/cluster.go
View File

@ -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 {

2
etcdserver/server.go
View File

@ -193,7 +193,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)