From e0d6f411fd1c618deec7bc72fd5d2af9d7c4ae8f Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 5 Nov 2021 14:24:47 -0400 Subject: [PATCH] mgr/orchestrator: clean up 'orch osd rm status' Signed-off-by: Sage Weil (cherry picked from commit d507e5479f6be2510e1edcab03b238ced6b41aa6) --- src/pybind/mgr/orchestrator/module.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/pybind/mgr/orchestrator/module.py b/src/pybind/mgr/orchestrator/module.py index 1128af69eae5f..b783ca64e7ac9 100644 --- a/src/pybind/mgr/orchestrator/module.py +++ b/src/pybind/mgr/orchestrator/module.py @@ -850,14 +850,17 @@ Usage: out = to_format(report, format, many=True, cls=None) else: table = PrettyTable( - ['OSD_ID', 'HOST', 'STATE', 'PG_COUNT', 'REPLACE', 'FORCE', 'DRAIN_STARTED_AT'], + ['OSD', 'HOST', 'STATE', 'PGS', 'REPLACE', 'FORCE', 'ZAP', + 'DRAIN STARTED AT'], border=False) table.align = 'l' + table._align['PGS'] = 'r' table.left_padding_width = 0 table.right_padding_width = 2 for osd in sorted(report, key=lambda o: o.osd_id): table.add_row([osd.osd_id, osd.hostname, osd.drain_status_human(), - osd.get_pg_count(), osd.replace, osd.force, osd.drain_started_at]) + osd.get_pg_count(), osd.replace, osd.force, osd.zap, + osd.drain_started_at or '']) out = table.get_string() return HandleCommandResult(stdout=out) -- 2.39.5