RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-17 07:57:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

mon: move health check into helper function

Browse Source 
Signed-off-by: Sage Weil <sage@inktank.com>
This commit is contained in:
Sage Weil 2012-05-18 14:08:11 -07:00
parent 09978a8ab2
commit 7d6facc03d
2 changed files with 44 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
src/mon/Monitor.cc
View File

@ -962,6 +962,41 @@ void Monitor::_mon_status(ostream& ss)
jf.flush(ss);
}
void Monitor::get_health(string& status, bufferlist *detailbl)
{
list<pair<health_status_t,string> > summary;
list<pair<health_status_t,string> > detail;
for (vector<PaxosService*>::iterator p = paxos_service.begin();
p != paxos_service.end();
p++) {
PaxosService *s = *p;
s->get_health(summary, detailbl ? &detail : NULL);
}
stringstream ss;
health_status_t overall = HEALTH_OK;
if (!summary.empty()) {
ss << ' ';
while (!summary.empty()) {
if (overall > summary.front().first)
overall = summary.front().first;
ss << summary.front().second;
summary.pop_front();
if (!summary.empty())
ss << "; ";
}
}
stringstream fss;
fss << overall;
status = fss.str() + ss.str();
while (!detail.empty()) {
detailbl->append(detail.front().second);
detailbl->append('\n');
detail.pop_front();
}
}
void Monitor::handle_command(MMonCommand *m)
{
if (m->fsid != monmap->fsid) {
@ -1074,37 +1109,7 @@ void Monitor::handle_command(MMonCommand *m)
r = 0;
}
if (m->cmd[0] == "health") {
list<pair<health_status_t,string> > summary;
list<pair<health_status_t,string> > detail;
for (vector<PaxosService*>::iterator p = paxos_service.begin();
p != paxos_service.end();
p++) {
PaxosService *s = *p;
ostringstream oss;
s->get_health(summary, (m->cmd.size() > 1) ? &detail : NULL);
}
stringstream ss;
health_status_t overall = HEALTH_OK;
if (!summary.empty()) {
ss << ' ';
while (!summary.empty()) {
if (overall > summary.front().first)
overall = summary.front().first;
ss << summary.front().second;
summary.pop_front();
if (!summary.empty())
ss << "; ";
}
}
stringstream fss;
fss << overall;
rs = fss.str() + ss.str();
while (!detail.empty()) {
rdata.append(detail.front().second);
rdata.append('\n');
detail.pop_front();
}
get_health(rs, (m->cmd.size() > 1) ? &rdata : NULL);
r = 0;
}
if (m->cmd[0] == "heap") {

8
src/mon/Monitor.h
View File

@ -269,6 +269,14 @@ public:
void handle_command(class MMonCommand *m);
void handle_route(MRoute *m);
/**
* generate health report
*
* @param status one-line status summary
* @param detailbl optional bufferlist* to fill with a detailed report
*/
void get_health(string& status, bufferlist *detailbl);
void reply_command(MMonCommand *m, int rc, const string &rs, version_t version);
void reply_command(MMonCommand *m, int rc, const string &rs, bufferlist& rdata, version_t version);