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: Cluster.IsIDremoved -> Cluster.IsIDRemoved

Browse Source
This commit is contained in:
Yicheng Qin 2014-10-23 14:29:58 -07:00
parent d47de988e4
commit 4d80f01201
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etcdserver/cluster.go
View File

@ -153,7 +153,7 @@ func (c Cluster) MemberIDs() []uint64 {
return ids return ids
} }
func (c *Cluster) IsIDremoved(id uint64) bool { func (c *Cluster) IsIDRemoved(id uint64) bool {
return c.removed[id] return c.removed[id]
} }

4
etcdserver/server.go
View File

@ -266,7 +266,7 @@ func (s *EtcdServer) start() {
} }
func (s *EtcdServer) Process(ctx context.Context, m raftpb.Message) error { func (s *EtcdServer) Process(ctx context.Context, m raftpb.Message) error {
if s.Cluster.IsIDremoved(m.From) { if s.Cluster.IsIDRemoved(m.From) {
return ErrRemoved return ErrRemoved
} }
return s.node.Step(ctx, m) return s.node.Step(ctx, m)
@ -612,7 +612,7 @@ func (s *EtcdServer) applyConfChange(cc raftpb.ConfChange, nodes []uint64) error
} }
func (s *EtcdServer) checkConfChange(cc raftpb.ConfChange, nodes []uint64) error { func (s *EtcdServer) checkConfChange(cc raftpb.ConfChange, nodes []uint64) error {
if s.Cluster.IsIDremoved(cc.NodeID) { if s.Cluster.IsIDRemoved(cc.NodeID) {
return ErrIDRemoved return ErrIDRemoved
} }
switch cc.Type { switch cc.Type {