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: remove NewClusterFromMemberInfos

Browse Source
This commit is contained in:
Yicheng Qin 2014-10-23 13:18:42 -07:00
parent f8b8bdeb17
commit e21de51768
3 changed files with 10 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
etcdserver/cluster.go
View File

@ -77,25 +77,6 @@ func NewClusterFromString(name string, cluster string) (*Cluster, error) {
return c, nil
}
type MemberInfo struct {
Name string
PeerURLs types.URLs
}
// NewClusterFromMembers returns Cluster with the given members.
func NewClusterFromMemberInfos(name string, infos []MemberInfo) (*Cluster, error) {
c := newCluster(name)
for _, info := range infos {
m := NewMember(info.Name, info.PeerURLs, c.name, nil)
if _, ok := c.members[m.ID]; ok {
return nil, fmt.Errorf("Member exists with identical ID %v", m)
}
c.members[m.ID] = m
}
c.genID()
return c, nil
}
func NewClusterFromStore(name string, st store.Store) *Cluster {
c := newCluster(name)
c.store = st

11
integration/cluster_test.go
View File

@ -85,17 +85,14 @@ func (c *cluster) Launch(t *testing.T) {
}
lns := make([]net.Listener, c.Size)
infos := make([]etcdserver.MemberInfo, c.Size)
addrs := make([]string, c.Size)
for i := 0; i < c.Size; i++ {
l := newLocalListener(t)
// each member claims only one peer listener
lns[i] = l
listenURLs, err := types.NewURLs([]string{"http://" + l.Addr().String()})
if err != nil {
t.Fatal(err)
}
infos[i] = etcdserver.MemberInfo{Name: c.name(i), PeerURLs: listenURLs}
addrs[i] = fmt.Sprintf("%v=%v", c.name(i), "http://"+l.Addr().String())
}
clusterStr := strings.Join(addrs, ",")
var err error
for i := 0; i < c.Size; i++ {
@ -112,7 +109,7 @@ func (c *cluster) Launch(t *testing.T) {
if err != nil {
t.Fatal(err)
}
m.Cluster, err = etcdserver.NewClusterFromMemberInfos(clusterName, infos)
m.Cluster, err = etcdserver.NewClusterFromString(clusterName, clusterStr)
if err != nil {
t.Fatal(err)
}

8
main.go
View File

@ -277,8 +277,12 @@ func setupCluster() error {
err = nil
switch {
case set["discovery"]:
infos := []etcdserver.MemberInfo{{Name: *name, PeerURLs: apurls}}
cluster, err = etcdserver.NewClusterFromMemberInfos(*durl, infos)
addrs := make([]string, 0)
for _, u := range apurls {
addrs = append(addrs, fmt.Sprintf("%v=%v", *name, u.String()))
}
clusterStr := strings.Join(addrs, ",")
cluster, err = etcdserver.NewClusterFromString(*durl, clusterStr)
case set["initial-cluster"]:
fallthrough
default: