Merge pull request #17067 from renhwztetecs/renhw-wip-mon-cleanup

mon: some cleanup

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
This commit is contained in:
Xie Xingguo 2017-08-19 17:43:49 +08:00 committed by GitHub
commit bda001fd2d
2 changed files with 4 additions and 4 deletions

View File

@ -199,7 +199,7 @@ COMMAND("auth rm " \
/*
* Monitor commands (Monitor.cc)
*/
COMMAND_WITH_FLAG("compact", "cause compaction of monitor's leveldb storage", \
COMMAND_WITH_FLAG("compact", "cause compaction of monitor's leveldb/rocksdb storage", \
"mon", "rw", "cli,rest", \
FLAG(NOFORWARD)|FLAG(DEPRECATED))
COMMAND_WITH_FLAG("scrub", "scrub the monitor stores", \
@ -264,7 +264,7 @@ COMMAND("node ls " \
* Monitor-specific commands under module 'mon'
*/
COMMAND_WITH_FLAG("mon compact", \
"cause compaction of monitor's leveldb storage", \
"cause compaction of monitor's leveldb/rocksdb storage", \
"mon", "rw", "cli,rest", \
FLAG(NOFORWARD))
COMMAND_WITH_FLAG("mon scrub",

View File

@ -396,7 +396,7 @@ void PGMapDigest::recovery_summary(Formatter *f, list<string> *psl,
} else {
ostringstream ss;
ss << delta_sum.stats.sum.num_objects_unfound
<< "/" << delta_sum.stats.sum.num_objects << " unfound (" << b << "%)";
<< "/" << delta_sum.stats.sum.num_objects << " objects unfound (" << b << "%)";
psl->push_back(ss.str());
}
}
@ -3097,7 +3097,7 @@ void PGMap::get_health_checks(
snprintf(b, sizeof(b), "%.3lf", pc);
ostringstream ss;
ss << pg_sum.stats.sum.num_objects_unfound
<< "/" << pg_sum.stats.sum.num_objects << " unfound (" << b << "%)";
<< "/" << pg_sum.stats.sum.num_objects << " objects unfound (" << b << "%)";
auto& d = checks->add("OBJECT_UNFOUND", HEALTH_WARN, ss.str());
for (auto& p : pg_stat) {