RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-26 05:25:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3230 from ceph/wip-pg-stat

Browse Source 
mon/PGMap: restructure 'pg stat' formatted output

Reviewed-by: John Spray <jspray@redhat.com>
This commit is contained in:
Sage Weil 2014-12-22 06:46:21 -08:00
commit 4047f2ddef
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
PendingReleaseNotes
View File

@ -44,3 +44,8 @@ v0.90
a bogus value (for example, when rados_watch() returns an error and
handle is not defined).
* The structure of the formatted 'pg stat' command is changed for the
portion that counts states by name to avoid using the '+' character
(which appears in state names) as part of the XML token (it is not
legal).

10
src/mon/PGMap.cc
View File

@ -1272,12 +1272,16 @@ void PGMap::print_oneline_summary(Formatter *f, ostream *out) const
std::stringstream ss;
if (f)
f->open_object_section("num_pg_by_state");
f->open_array_section("num_pg_by_state");
for (ceph::unordered_map<int,int>::const_iterator p = num_pg_by_state.begin();
p != num_pg_by_state.end();
++p) {
if (f)
f->dump_unsigned(pg_state_string(p->first).c_str(), p->second);
if (f) {
f->open_object_section("state");
f->dump_string("name", pg_state_string(p->first));
f->dump_unsigned("num", p->second);
f->close_section();
}
if (p != num_pg_by_state.begin())
ss << ", ";
ss << p->second << " " << pg_state_string(p->first);