osd/OSDMap: include age in up and in counts for ceph status

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/qa/standalone/scrub/osd-scrub-repair.sh b/qa/standalone/scrub/osd-scrub-repair.sh
index a2a1333eb48571a1a8e3df703ae3f132a0eef73b..ee1833c6fdfbc23693bfa1303e153d9602774152 100755 (executable)
--- 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 a132fd42af2a84fb24cb08ef0e830daf91d2ac99..006effffec26e1182efddf01a3a55f6802e60ce2 100755 (executable)
--- 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 a1f6576da7df560ce0546a6d9ed9a3a5d37972a7..7bb710a71a7f4f361f304b56f73fb5a96b664e52 100644 (file)
--- 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())