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

mon: move quorum_status into helper

Browse Source 
Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
This commit is contained in:
Sage Weil 2012-02-11 14:29:52 -08:00
parent 60067f842b
commit e4258ce04b
2 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/mon/Monitor.cc
View File

@ -778,6 +778,29 @@ bool Monitor::_allowed_command(MonSession *s, const vector<string>& cmd)
return false;
}
void Monitor::_quorum_status(ostream& ss)
{
if (!is_leader() && !is_peon()) {
return;
}
JSONFormatter jf(true);
jf.open_object_section("quorum_status");
jf.dump_int("election_epoch", get_epoch());
jf.open_array_section("quorum");
for (set<int>::iterator p = quorum.begin(); p != quorum.end(); ++p)
jf.dump_int("mon", *p);
jf.close_section();
jf.open_object_section("monmap");
monmap->dump(&jf);
jf.close_section();
jf.close_section();
jf.flush(ss);
}
void Monitor::_mon_status(ostream& ss)
{
JSONFormatter jf(true);
@ -903,31 +926,14 @@ void Monitor::handle_command(MMonCommand *m)
return;
}
if (m->cmd[0] == "quorum_status") {
// make sure our map is readable and up to date
if (!is_leader() && !is_peon()) {
dout(10) << " waiting for qorum" << dendl;
waitfor_quorum.push_back(new C_RetryMessage(this, m));
return;
}
JSONFormatter jf(true);
jf.open_object_section("quorum_status");
jf.dump_int("election_epoch", get_epoch());
jf.open_array_section("quorum");
for (set<int>::iterator p = quorum.begin(); p != quorum.end(); ++p)
jf.dump_int("mon", *p);
jf.close_section();
jf.open_object_section("monmap");
monmap->dump(&jf);
jf.close_section();
jf.close_section();
stringstream ss;
jf.flush(ss);
_quorum_status(ss);
rs = ss.str();
r = 0;
}

1
src/mon/Monitor.h
View File

@ -240,6 +240,7 @@ public:
void handle_mon_get_map(MMonGetMap *m);
bool _allowed_command(MonSession *s, const vector<std::string>& cmd);
void _mon_status(ostream& ss);
void _quorum_status(ostream& ss);
void handle_command(class MMonCommand *m);
void handle_observe(MMonObserve *m);
void handle_route(MRoute *m);