RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-02 00:52:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

mon: Monitor: make 'quorum enter/exit' available through the admin socket

Browse Source 
If we don't have at least 'quorum enter' available through the admin
socket, then we can never tell a monitor to go back into quorum after
exiting, since it will not handle the command that forces it back in due
to not being in the quorum.

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
This commit is contained in:
Joao Eduardo Luis 2013-11-08 00:26:42 +00:00
parent 84fb1bf3ee
commit 762acec422
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/mon/Monitor.cc
View File

@ -258,9 +258,17 @@ void Monitor::do_admin_command(string command, cmdmap_t& cmdmap, string format,
return;
}
sync_force(f.get(), ss);
} else if (command.find("add_bootstrap_peer_hint") == 0)
} else if (command.find("add_bootstrap_peer_hint") == 0) {
_add_bootstrap_peer_hint(command, cmdmap, ss);
else
} else if (command == "quorum enter") {
elector.start_participating();
start_election();
ss << "started responding to quorum, initiated new election";
} else if (command == "quorum exit") {
start_election();
elector.stop_participating();
ss << "stopped responding to quorum, initiated new election";
} else
assert(0 == "bad AdminSocket command binding");
}
@ -504,6 +512,14 @@ int Monitor::preinit()
"add peer address as potential bootstrap"
" peer for cluster bringup");
assert(r == 0);
r = admin_socket->register_command("quorum enter", "quorum enter",
admin_hook,
"force monitor back into quorum");
assert(r == 0);
r = admin_socket->register_command("quorum exit", "quorum exit",
admin_hook,
"force monitor out of the quorum");
assert(r == 0);
lock.Lock();
lock.Unlock();