Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

etcdserver: getOtherPeerURLs -> getRemotePeerURLs

Browse Source
This commit is contained in:
Xiang Li 2015-02-13 18:56:45 -08:00
parent e44dc0f3fe
commit f7540912d6
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
etcdserver/cluster_util.go
View File

@ -29,7 +29,7 @@ import (
// isMemberBootstrapped tries to check if the given member has been bootstrapped // isMemberBootstrapped tries to check if the given member has been bootstrapped
// in the given cluster. // in the given cluster.
func isMemberBootstrapped(cl *Cluster, member string, tr *http.Transport) bool { func isMemberBootstrapped(cl *Cluster, member string, tr *http.Transport) bool {
us := getOtherPeerURLs(cl, member) us := getRemotePeerURLs(cl, member)
rcl, err := getClusterFromPeers(us, false, tr) rcl, err := getClusterFromPeers(us, false, tr)
if err != nil { if err != nil {
return false return false
@ -94,12 +94,12 @@ func getClusterFromPeers(urls []string, logerr bool, tr *http.Transport) (*Clust
return nil, fmt.Errorf("etcdserver: could not retrieve cluster information from the given urls") return nil, fmt.Errorf("etcdserver: could not retrieve cluster information from the given urls")
} }
// getOtherPeerURLs returns peer urls of other members in the cluster. The // getRemotePeerURLs returns peer urls of remote members in the cluster. The
// returned list is sorted in ascending lexicographical order. // returned list is sorted in ascending lexicographical order.
func getOtherPeerURLs(cl ClusterInfo, self string) []string { func getRemotePeerURLs(cl ClusterInfo, local string) []string {
us := make([]string, 0) us := make([]string, 0)
for _, m := range cl.Members() { for _, m := range cl.Members() {
if m.Name == self { if m.Name == local {
continue continue
} }
us = append(us, m.PeerURLs...) us = append(us, m.PeerURLs...)

2
etcdserver/server.go
View File

@ -157,7 +157,7 @@ func NewServer(cfg *ServerConfig) (*EtcdServer, error) {
switch { switch {
case !haveWAL && !cfg.NewCluster: case !haveWAL && !cfg.NewCluster:
us := getOtherPeerURLs(cfg.Cluster, cfg.Name) us := getRemotePeerURLs(cfg.Cluster, cfg.Name)
existingCluster, err := GetClusterFromPeers(us, cfg.Transport) existingCluster, err := GetClusterFromPeers(us, cfg.Transport)
if err != nil { if err != nil {
return nil, fmt.Errorf("cannot fetch cluster info from peer urls: %v", err) return nil, fmt.Errorf("cannot fetch cluster info from peer urls: %v", err)