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: MemberFromName -> MemberByName

Browse Source
This commit is contained in:
Yicheng Qin 2014-10-23 11:08:42 -07:00
parent 89572b5fd7
commit 67412e07f8
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etcdserver/cluster.go
View File

@ -141,7 +141,7 @@ func (c *Cluster) Member(id uint64) *Member {
return c.members[id]
}
func (c *Cluster) MemberFromName(name string) *Member {
func (c *Cluster) MemberByName(name string) *Member {
for _, m := range c.members {
if m.Name == name {
return m

2
etcdserver/cluster_test.go
View File

@ -147,7 +147,7 @@ func TestClusterMemberFromName(t *testing.T) {
}
for i, tt := range tests {
c := newTestCluster(membs)
m := c.MemberFromName(tt.name)
m := c.MemberByName(tt.name)
if g := m != nil; g != tt.match {
t.Errorf("#%d: find member = %v, want %v", i, g, tt.match)
}

2
etcdserver/config.go
View File

@ -40,7 +40,7 @@ type ServerConfig struct {
// VerifyBootstrapConfig sanity-checks the initial config and returns an error
// for things that should never happen.
func (c *ServerConfig) VerifyBootstrapConfig() error {
m := c.Cluster.MemberFromName(c.Name)
m := c.Cluster.MemberByName(c.Name)
// Make sure the cluster at least contains the local server.
if m == nil {
return fmt.Errorf("couldn't find local name %s in the initial cluster configuration", c.Name)

4
etcdserver/server.go
View File

@ -180,7 +180,7 @@ func NewServer(cfg *ServerConfig) *EtcdServer {
if err := cfg.VerifyBootstrapConfig(); err != nil {
log.Fatalf("etcdserver: %v", err)
}
m := cfg.Cluster.MemberFromName(cfg.Name)
m := cfg.Cluster.MemberByName(cfg.Name)
if cfg.ShouldDiscover() {
d, err := discovery.New(cfg.DiscoveryURL, m.ID, cfg.Cluster.String())
if err != nil {
@ -646,7 +646,7 @@ func startNode(cfg *ServerConfig) (id uint64, n raft.Node, w *wal.WAL) {
var err error
// TODO: remove the discoveryURL when it becomes part of the source for
// generating nodeID.
member := cfg.Cluster.MemberFromName(cfg.Name)
member := cfg.Cluster.MemberByName(cfg.Name)
cfg.Cluster.GenID([]byte(cfg.DiscoveryURL))
metadata := pbutil.MustMarshal(&pb.Metadata{NodeID: member.ID, ClusterID: cfg.Cluster.ID()})
if w, err = wal.Create(cfg.WALDir(), metadata); err != nil {