mgr/DaemonServer: show wear level in 'device ls' output

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit 8f93e3b55351df0bc8308e0cace482aabb15e8c8)

diff --git a/src/mgr/DaemonServer.cc b/src/mgr/DaemonServer.cc
index 815c8589e8242853310b0741ddbcfc01387e324d..50d828d44d3efceaf7b3a6713aa581dcda84f65e 100644 (file)
--- a/src/mgr/DaemonServer.cc
+++ b/src/mgr/DaemonServer.cc
@@ -2040,6 +2040,7 @@ bool DaemonServer::_handle_command(
       tbl.define_column("DEVICE", TextTable::LEFT, TextTable::LEFT);
       tbl.define_column("HOST:DEV", TextTable::LEFT, TextTable::LEFT);
       tbl.define_column("DAEMONS", TextTable::LEFT, TextTable::LEFT);
+      tbl.define_column("WEAR", TextTable::RIGHT, TextTable::RIGHT);
       tbl.define_column("LIFE EXPECTANCY", TextTable::LEFT, TextTable::LEFT);
       auto now = ceph_clock_now();
       daemon_state.with_devices([&tbl, now](const DeviceState& dev) {
@@ -2057,9 +2058,15 @@ bool DaemonServer::_handle_command(
            }
            d += to_string(i);
          }
+         char wear_level_str[16] = {0};
+         if (dev.wear_level >= 0) {
+           snprintf(wear_level_str, sizeof(wear_level_str)-1, "%d%%",
+                    (int)(100.1 * dev.wear_level));
+         }
          tbl << dev.devid
              << h
              << d
+             << wear_level_str
              << dev.get_life_expectancy_str(now)
              << TextTable::endrow;
        });