diff options
| author | Sage Weil <sage@inktank.com> | 2013-08-13 15:49:30 -0700 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-08-13 16:51:38 -0700 |
| commit | 054fd886d009f5374a7b563a08788edc72778734 (patch) | |
| tree | d7908571e79ab5036ad7bb8a6589e1e2550912ca | |
| parent | f417b10196ae6b7b4674861507e25366be34f948 (diff) | |
| download | ceph-054fd886d009f5374a7b563a08788edc72778734.tar.gz | |
mon: expand osd summary (flags on separate line)
Signed-off-by: Sage Weil <sage@inktank.com>
| -rw-r--r-- | src/mon/Monitor.cc | 2 | ||||
| -rw-r--r-- | src/osd/OSDMap.cc | 10 |
2 files changed, 5 insertions, 7 deletions
diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc index 47488fc4f8b..e6dbd23881b 100644 --- a/src/mon/Monitor.cc +++ b/src/mon/Monitor.cc @@ -1833,7 +1833,7 @@ void Monitor::get_status(stringstream &ss, Formatter *f) ss << " health " << health << "\n"; ss << " monmap " << *monmap << ", election epoch " << get_epoch() << ", quorum " << get_quorum() << " " << get_quorum_names() << "\n"; - ss << " osdmap " << osdmon()->osdmap << "\n"; + osdmon()->osdmap.print_summary(NULL, ss); ss << " pgmap " << pgmon()->pg_map << "\n"; ss << " mdsmap " << mdsmon()->mdsmap << "\n"; } diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc index 2c035f46b04..f9dfa679170 100644 --- a/src/osd/OSDMap.cc +++ b/src/osd/OSDMap.cc @@ -1743,14 +1743,12 @@ void OSDMap::print_summary(Formatter *f, ostream& out) const "true" : "false"); f->close_section(); } else { - out << "e" << get_epoch() << ": " + out << " osdmap e" << get_epoch() << ": " << get_num_osds() << " osds: " << get_num_up_osds() << " up, " - << get_num_in_osds() << " in"; - if (test_flag(CEPH_OSDMAP_FULL)) - out << " full"; - else if (test_flag(CEPH_OSDMAP_NEARFULL)) - out << " nearfull"; + << get_num_in_osds() << " in\n"; + if (flags) + out << " flags " << get_flag_string() << "\n"; } } |