Browse Source

etcdserver: s/parseMemberID/mustParseMemberIDFromKey/

Brian Waldon 11 years ago
parent
commit
80172c3d4a
3 changed files with 4 additions and 4 deletions
  1. 2 2
      etcdserver/cluster.go
  2. 1 1
      etcdserver/member.go
  3. 1 1
      etcdserver/server.go

+ 2 - 2
etcdserver/cluster.go

@@ -113,7 +113,7 @@ func NewClusterFromStore(name string, st store.Store) *Cluster {
 		log.Panicf("get storeRemovedMembers should never fail: %v", err)
 	}
 	for _, n := range e.Node.Nodes {
-		c.removed[parseMemberID(n.Key)] = true
+		c.removed[mustParseMemberIDFromKey(n.Key)] = true
 	}
 
 	return c
@@ -303,7 +303,7 @@ func (c *Cluster) RemoveMember(id uint64) {
 // nodeToMember builds member through a store node.
 // the child nodes of the given node should be sorted by key.
 func nodeToMember(n *store.NodeExtern) (*Member, error) {
-	m := &Member{ID: parseMemberID(n.Key)}
+	m := &Member{ID: mustParseMemberIDFromKey(n.Key)}
 	if len(n.Nodes) != 2 {
 		return m, fmt.Errorf("len(nodes) = %d, want 2", len(n.Nodes))
 	}

+ 1 - 1
etcdserver/member.go

@@ -85,7 +85,7 @@ func memberStoreKey(id uint64) string {
 	return path.Join(storeMembersPrefix, idAsHex(id))
 }
 
-func parseMemberID(key string) uint64 {
+func mustParseMemberIDFromKey(key string) uint64 {
 	id, err := strconv.ParseUint(path.Base(key), 16, 64)
 	if err != nil {
 		log.Panicf("unexpected parse member id error: %v", err)

+ 1 - 1
etcdserver/server.go

@@ -592,7 +592,7 @@ func (s *EtcdServer) applyRequest(r pb.Request) Response {
 			return f(s.store.CompareAndSwap(r.Path, r.PrevValue, r.PrevIndex, r.Val, expr))
 		default:
 			if storeMemberAttributeRegexp.MatchString(r.Path) {
-				id := parseMemberID(path.Dir(r.Path))
+				id := mustParseMemberIDFromKey(path.Dir(r.Path))
 				m := s.Cluster.Member(id)
 				if m == nil {
 					log.Fatalf("fetch member %x should never fail", id)