RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-05 07:48:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/ceph/ceph

Browse Source
This commit is contained in:
John Wilkins 2013-08-21 11:02:26 -07:00
commit d5a877867a
4 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mon/MonCommands.h
View File

@ -111,7 +111,7 @@ COMMAND("pg getmap", "get binary pg map to -o/stdout", "pg", "r", "cli,rest")
COMMAND("pg send_pg_creates", "trigger pg creates to be issued",\
"pg", "rw", "cli,rest")
COMMAND("pg dump " \
"name=dumpcontents,type=CephChoices,strings=all|summary|sum|pools|osds|pgs|pgs_brief,n=N,req=false", \
"name=dumpcontents,type=CephChoices,strings=all|summary|sum|delta|pools|osds|pgs|pgs_brief,n=N,req=false", \
"show human-readable versions of pg map", "pg", "r", "cli,rest")
COMMAND("pg dump_json " \
"name=dumpcontents,type=CephChoices,strings=all|summary|sum|pools|osds|pgs,n=N,req=false", \

13
src/mon/PGMap.cc
View File

@ -513,13 +513,18 @@ void PGMap::dump_basic(Formatter *f) const
pg_sum.dump(f);
f->close_section();
f->open_object_section("pg_stats_delta");
pg_sum_delta.dump(f);
f->close_section();
f->open_object_section("osd_stats_sum");
osd_sum.dump(f);
f->close_section();
dump_delta(f);
}
void PGMap::dump_delta(Formatter *f) const
{
f->open_object_section("pg_stats_delta");
pg_sum_delta.dump(f);
f->close_section();
}
void PGMap::dump_pg_stats(Formatter *f, bool brief) const

1
src/mon/PGMap.h
View File

@ -158,6 +158,7 @@ public:
void dump_pg_stats(Formatter *f, bool brief) const;
void dump_pool_stats(Formatter *f) const;
void dump_osd_stats(Formatter *f) const;
void dump_delta(Formatter *f) const;
void dump_pg_stats_plain(ostream& ss,
const hash_map<pg_t, pg_stat_t>& pg_stats) const;

5
src/mon/PGMonitor.cc
View File

@ -1406,6 +1406,11 @@ bool PGMonitor::preprocess_command(MMonCommand *m)
if (what.count("pgs_brief")) {
pg_map.dump_pg_stats(f.get(), true);
}
if (what.count("delta")) {
f->open_object_section("delta");
pg_map.dump_delta(f.get());
f->close_section();
}
}
f->flush(ds);
} else {