From: jianglong01 Date: Tue, 7 Sep 2021 07:49:04 +0000 (+0800) Subject: mgr/cephadm: the display of 'orch osd rm status' is incorrect X-Git-Tag: v16.2.7~67^2~29 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a1d91c37132eff59c4a0aac2138eb93a90c97101;p=ceph.git mgr/cephadm: the display of 'orch osd rm status' is incorrect After exec 'ceph orch osd rm --replace', 'orch osd rm status' has an wrong display. wrong display: OSD_ID HOST STATE PG_COUNT REPLACE FORCE DRAIN_STARTED_AT 15 cephqa08.cpp.zzbm.qianxin-inc.cn draining 0 True True 2021-09-07 07:54:05.776906 correct display: OSD_ID HOST STATE PG_COUNT REPLACE FORCE DRAIN_STARTED_AT 15 cephqa08.cpp.zzbm.qianxin-inc.cn draining 0 True False 2021-09-07 07:35:34.731417 Signed-off-by: jianglong01 (cherry picked from commit 465f7e8fa34b37cf09e4d280da5239086924b942) --- diff --git a/src/pybind/mgr/orchestrator/module.py b/src/pybind/mgr/orchestrator/module.py index 8b194b8a00d..0dc21ba58c1 100644 --- a/src/pybind/mgr/orchestrator/module.py +++ b/src/pybind/mgr/orchestrator/module.py @@ -862,7 +862,7 @@ Usage: 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.replace, osd.drain_started_at]) + osd.get_pg_count(), osd.replace, osd.force, osd.drain_started_at]) out = table.get_string() return HandleCommandResult(stdout=out)