From 49ddecdac1220b015819dc3f3f799083b2c4c101 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 13 Aug 2013 16:59:14 -0700 Subject: [PATCH] mon: status: client io, recovery io prefixes Signed-off-by: Sage Weil --- src/mon/Monitor.cc | 8 ++++---- src/mon/PGMap.cc | 16 ++++++++-------- src/osd/OSDMap.cc | 4 ++-- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc index d1f799a04798c..cf10f911258f9 100644 --- a/src/mon/Monitor.cc +++ b/src/mon/Monitor.cc @@ -1829,12 +1829,12 @@ void Monitor::get_status(stringstream &ss, Formatter *f) f->close_section(); f->close_section(); } else { - ss << " cluster " << monmap->get_fsid() << "\n"; - ss << " health " << health << "\n"; - ss << " monmap " << *monmap << ", election epoch " << get_epoch() + ss << " cluster " << monmap->get_fsid() << "\n"; + ss << " health " << health << "\n"; + ss << " monmap " << *monmap << ", election epoch " << get_epoch() << ", quorum " << get_quorum() << " " << get_quorum_names() << "\n"; if (mdsmon()->mdsmap.get_epoch() > 1) - ss << " mdsmap " << mdsmon()->mdsmap << "\n"; + ss << " mdsmap " << mdsmon()->mdsmap << "\n"; osdmon()->osdmap.print_summary(NULL, ss); pgmon()->pg_map.print_summary(NULL, &ss); } diff --git a/src/mon/PGMap.cc b/src/mon/PGMap.cc index 279ecaab3891a..224f149f6ed4f 100644 --- a/src/mon/PGMap.cc +++ b/src/mon/PGMap.cc @@ -754,7 +754,7 @@ void PGMap::recovery_rate_summary(Formatter *f, ostream *out) const *out << pretty_si_t(bps) << "B/s"; if (pos_delta.stats.sum.num_keys_recovered) *out << ", " << pretty_si_t(kps) << "keys/s"; - *out << ", " << pretty_si_t(objps) << "objects/s recovering"; + *out << ", " << pretty_si_t(objps) << "objects/s"; } } } @@ -803,7 +803,7 @@ void PGMap::print_summary(Formatter *f, ostream *out) const f->close_section(); } else { ss.setf(std::ios::right); - ss << " " << std::setw(7) << p->second << " " << pg_state_string(p->first) << "\n"; + ss << " " << std::setw(7) << p->second << " " << pg_state_string(p->first) << "\n"; ss.unsetf(std::ios::right); } } @@ -818,11 +818,11 @@ void PGMap::print_summary(Formatter *f, ostream *out) const f->dump_unsigned("bytes_avail", osd_sum.kb_avail * 4096ull); f->dump_unsigned("bytes_total", osd_sum.kb * 4096ull); } else { - *out << " pgmap v" << version << ": " + *out << " pgmap v" << version << ": " << pg_stat.size() << " pgs, " << pg_pool_sum.size() << " pools, " << prettybyte_t(pg_sum.stats.sum.num_bytes) << " data, " << pretty_si_t(pg_sum.stats.sum.num_objects) << "objects\n"; - *out << " " + *out << " " << kb_t(osd_sum.kb_used) << " used, " << kb_t(osd_sum.kb_avail) << " / " << kb_t(osd_sum.kb) << " avail\n"; @@ -831,7 +831,7 @@ void PGMap::print_summary(Formatter *f, ostream *out) const std::stringstream ssr; recovery_summary(f, &ssr); if (!f && ssr.str().length()) - *out << " " << ssr.str() << "\n"; + *out << " " << ssr.str() << "\n"; ssr.clear(); ssr.str(""); @@ -840,7 +840,7 @@ void PGMap::print_summary(Formatter *f, ostream *out) const recovery_rate_summary(f, &ssr); if (!f && ssr.str().length()) - *out << " " << ssr.str() << "\n"; + *out << "recovery io " << ssr.str() << "\n"; // make non-negative; we can get negative values if osds send // uncommitted stats and then "go backward" or if they are just @@ -850,7 +850,7 @@ void PGMap::print_summary(Formatter *f, ostream *out) const if (pos_delta.stats.sum.num_rd || pos_delta.stats.sum.num_wr) { if (!f) - *out << " load "; + *out << " client io "; if (pos_delta.stats.sum.num_rd) { int64_t rd = (pos_delta.stats.sum.num_rd_kb << 10) / (double)stamp_delta; if (f) { @@ -927,7 +927,7 @@ void PGMap::print_oneline_summary(ostream *out) const ssr.str(""); recovery_rate_summary(NULL, &ssr); if (ssr.str().length()) - *out << "; " << ssr.str(); + *out << "; " << ssr.str() " recovering"; } void PGMap::generate_test_instances(list& o) diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc index f9dfa67917048..3b7b498eb27a7 100644 --- a/src/osd/OSDMap.cc +++ b/src/osd/OSDMap.cc @@ -1743,12 +1743,12 @@ void OSDMap::print_summary(Formatter *f, ostream& out) const "true" : "false"); f->close_section(); } else { - out << " osdmap e" << get_epoch() << ": " + out << " osdmap e" << get_epoch() << ": " << get_num_osds() << " osds: " << get_num_up_osds() << " up, " << get_num_in_osds() << " in\n"; if (flags) - out << " flags " << get_flag_string() << "\n"; + out << " flags " << get_flag_string() << "\n"; } } -- 2.39.5