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

Intermediate commit.

Browse Source
This commit is contained in:
Ben Johnson
2013-10-12 00:28:46 -06:00
parent 89334df5ae
commit eb78d96a20
27 changed files with 953 additions and 923 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
server/remove_command.go
View File

@@ -25,22 +25,20 @@ func (c *RemoveCommand) CommandName() string {
// Remove a server from the cluster
func (c *RemoveCommand) Apply(server *raft.Server) (interface{}, error) {
s, _ := server.StateMachine().(*store.Store)
r, _ := server.Context().(*RaftServer)
ps, _ := server.Context().(*PeerServer)
// remove machine in etcd storage
key := path.Join("_etcd/machines", c.Name)
// Remove node from the shared registry.
err := ps.registry.Unregister(c.Name, server.CommitIndex(), server.Term())
_, err := s.Delete(key, false, server.CommitIndex(), server.Term())
// delete from stats
delete(r.followersStats.Followers, c.Name)
// Delete from stats
delete(ps.followersStats.Followers, c.Name)
if err != nil {
return []byte{0}, err
}
// remove peer in raft
// Remove peer in raft
err = server.RemovePeer(c.Name)
if err != nil {
return []byte{0}, err
}
@@ -52,7 +50,7 @@ func (c *RemoveCommand) Apply(server *raft.Server) (interface{}, error) {
// and the node has sent out a join request in this
// start. It is sure that this node received a new remove
// command and need to be removed
if server.CommitIndex() > r.joinIndex && r.joinIndex != 0 {
if server.CommitIndex() > ps.joinIndex && ps.joinIndex != 0 {
debugf("server [%s] is removed", server.Name())
os.Exit(0)
} else {