|
@@ -679,22 +679,22 @@ func GetClusterFromPeers(urls []string) (*Cluster, error) {
|
|
|
for _, u := range urls {
|
|
for _, u := range urls {
|
|
|
resp, err := http.Get(u + "/members")
|
|
resp, err := http.Get(u + "/members")
|
|
|
if err != nil {
|
|
if err != nil {
|
|
|
- log.Printf("etcdserver: get /members on %s: %v", u, err)
|
|
|
|
|
|
|
+ log.Printf("etcdserver: could not get cluster response from %s: %v", u, err)
|
|
|
continue
|
|
continue
|
|
|
}
|
|
}
|
|
|
b, err := ioutil.ReadAll(resp.Body)
|
|
b, err := ioutil.ReadAll(resp.Body)
|
|
|
if err != nil {
|
|
if err != nil {
|
|
|
- log.Printf("etcdserver: read body error: %v", err)
|
|
|
|
|
|
|
+ log.Printf("etcdserver: could not read the body of cluster response: %v", err)
|
|
|
continue
|
|
continue
|
|
|
}
|
|
}
|
|
|
var membs []*Member
|
|
var membs []*Member
|
|
|
if err := json.Unmarshal(b, &membs); err != nil {
|
|
if err := json.Unmarshal(b, &membs); err != nil {
|
|
|
- log.Printf("etcdserver: unmarshal body error: %v", err)
|
|
|
|
|
|
|
+ log.Printf("etcdserver: could not unmarshal cluster response: %v", err)
|
|
|
continue
|
|
continue
|
|
|
}
|
|
}
|
|
|
id, err := types.IDFromString(resp.Header.Get("X-Etcd-Cluster-ID"))
|
|
id, err := types.IDFromString(resp.Header.Get("X-Etcd-Cluster-ID"))
|
|
|
if err != nil {
|
|
if err != nil {
|
|
|
- log.Printf("etcdserver: parse uint error: %v", err)
|
|
|
|
|
|
|
+ log.Printf("etcdserver: could not parse the cluster ID from cluster res: %v", err)
|
|
|
continue
|
|
continue
|
|
|
}
|
|
}
|
|
|
return NewClusterFromMembers("", id, membs), nil
|
|
return NewClusterFromMembers("", id, membs), nil
|