From 4fc02a7f481b4b57cb4429df5694fe0de688d4c9 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 31 Aug 2018 15:36:20 -0500 Subject: [PATCH] osd/OSDMap: include age in up and in counts for ceph status Signed-off-by: Sage Weil --- qa/standalone/scrub/osd-scrub-repair.sh | 3 ++- qa/workunits/cephtool/test.sh | 2 +- src/osd/OSDMap.cc | 11 +++++++++-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/qa/standalone/scrub/osd-scrub-repair.sh b/qa/standalone/scrub/osd-scrub-repair.sh index a2a1333eb48..ee1833c6fdf 100755 --- a/qa/standalone/scrub/osd-scrub-repair.sh +++ b/qa/standalone/scrub/osd-scrub-repair.sh @@ -385,7 +385,8 @@ function unfound_erasure_coded() { ceph -s | grep "1/1 objects unfound" && break sleep 1 done - ceph -s|grep "4 osds: 4 up, 4 in" || return 1 + ceph -s|grep "4 up" || return 1 + ceph -s|grep "4 in" || return 1 ceph -s|grep "1/1 objects unfound" || return 1 teardown $dir || return 1 diff --git a/qa/workunits/cephtool/test.sh b/qa/workunits/cephtool/test.sh index a132fd42af2..006effffec2 100755 --- a/qa/workunits/cephtool/test.sh +++ b/qa/workunits/cephtool/test.sh @@ -1658,7 +1658,7 @@ function test_mon_osd() ceph osd perf ceph osd blocked-by - ceph osd stat | grep up, + ceph osd stat | grep up } function test_mon_crush() diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc index a1f6576da7d..7bb710a71a7 100644 --- a/src/osd/OSDMap.cc +++ b/src/osd/OSDMap.cc @@ -3689,9 +3689,16 @@ void OSDMap::print_summary(Formatter *f, ostream& out, f->dump_unsigned("num_remapped_pgs", get_num_pg_temp()); f->close_section(); } else { + utime_t now = ceph_clock_now(); out << get_num_osds() << " osds: " - << get_num_up_osds() << " up, " - << get_num_in_osds() << " in"; + << get_num_up_osds() << " up"; + if (last_up_change != utime_t()) { + out << " (since " << utimespan_str(now - last_up_change) << ")"; + } + out << ", " << get_num_in_osds() << " in"; + if (last_in_change != utime_t()) { + out << " (since " << utimespan_str(now - last_in_change) << ")"; + } if (extra) out << "; epoch: e" << get_epoch(); if (get_num_pg_temp()) -- 2.47.3