Browse Source

etcdserver: remove unnecessary indirection

Xiang Li 11 years ago
parent
commit
1535596252
1 changed files with 5 additions and 12 deletions
  1. 5 12
      etcdserver/server.go

+ 5 - 12
etcdserver/server.go

@@ -272,8 +272,11 @@ func NewServer(cfg *ServerConfig) (*EtcdServer, error) {
 		snapCount:   cfg.SnapCount,
 		snapCount:   cfg.SnapCount,
 	}
 	}
 	srv.sendhub = newSendHub(cfg.Transport, cfg.Cluster, srv, sstats, lstats)
 	srv.sendhub = newSendHub(cfg.Transport, cfg.Cluster, srv, sstats, lstats)
-	for _, m := range getOtherMembers(cfg.Cluster, cfg.Name) {
-		srv.sendhub.Add(m)
+	// add all the remote members into sendhub
+	for _, m := range cfg.Cluster.Members() {
+		if m.Name != cfg.Name {
+			srv.sendhub.Add(m)
+		}
 	}
 	}
 	return srv, nil
 	return srv, nil
 }
 }
@@ -952,16 +955,6 @@ func getClusterFromPeers(urls []string, logerr bool) (*Cluster, error) {
 	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")
 }
 }
 
 
-func getOtherMembers(cl ClusterInfo, self string) []*Member {
-	var ms []*Member
-	for _, m := range cl.Members() {
-		if m.Name != self {
-			ms = append(ms, m)
-		}
-	}
-	return ms
-}
-
 // getOtherPeerURLs returns peer urls of other members in the cluster. The
 // getOtherPeerURLs returns peer urls of other 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 getOtherPeerURLs(cl ClusterInfo, self string) []string {