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

Merge pull request #23921 from croit/fix-35544

Browse Source 
osd/OSDMap: add osd status to utilization dumper

Reviewed-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Kefu Chai 2018-09-11 20:23:56 +08:00 committed by GitHub
commit fb80f5b1b7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/osd/OSDMap.cc
View File

@ -4700,6 +4700,7 @@ public:
tbl->define_column("%USE", TextTable::LEFT, TextTable::RIGHT);
tbl->define_column("VAR", TextTable::LEFT, TextTable::RIGHT);
tbl->define_column("PGS", TextTable::LEFT, TextTable::RIGHT);
tbl->define_column("STATUS", TextTable::LEFT, TextTable::RIGHT);
if (tree)
tbl->define_column("TYPE NAME", TextTable::LEFT, TextTable::LEFT);
@ -4759,8 +4760,16 @@ protected:
if (qi.is_bucket()) {
*tbl << "-";
*tbl << "";
} else {
*tbl << num_pgs;
if (osdmap->is_up(qi.id)) {
*tbl << "up";
} else if (osdmap->is_destroyed(qi.id)) {
*tbl << "destroyed";
} else {
*tbl << "down";
}
}
if (tree) {
@ -4847,6 +4856,15 @@ protected:
f->dump_float("utilization", util);
f->dump_float("var", var);
f->dump_unsigned("pgs", num_pgs);
if (!qi.is_bucket()) {
if (osdmap->is_up(qi.id)) {
f->dump_string("status", "up");
} else if (osdmap->is_destroyed(qi.id)) {
f->dump_string("status", "destroyed");
} else {
f->dump_string("status", "down");
}
}
CrushTreeDumper::dump_bucket_children(crush, qi, f);
f->close_section();
}