From: Adam King Date: Thu, 17 Nov 2022 18:14:55 +0000 (-0500) Subject: mgr/orchestrator: fix device size in `orch device ls` output X-Git-Tag: v18.1.0~130^2~21 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e3607c43e519b92c36d406789b0d5c2bf6985b76;p=ceph.git mgr/orchestrator: fix device size in `orch device ls` output Fixes: https://tracker.ceph.com/issues/58045 Signed-off-by: Adam King (cherry picked from commit 7e576185ac87877e4d626c09bdef34e194042778) --- diff --git a/src/pybind/mgr/orchestrator/module.py b/src/pybind/mgr/orchestrator/module.py index fcda16d1dd3..60955697752 100644 --- a/src/pybind/mgr/orchestrator/module.py +++ b/src/pybind/mgr/orchestrator/module.py @@ -21,7 +21,7 @@ from ceph.deployment.service_spec import PlacementSpec, ServiceSpec, service_spe from ceph.deployment.hostspec import SpecValidationError from ceph.utils import datetime_now -from mgr_util import to_pretty_timedelta, format_dimless, format_bytes +from mgr_util import to_pretty_timedelta, format_bytes from mgr_module import MgrModule, HandleCommandResult, Option from object_format import Format @@ -665,7 +665,7 @@ class OrchestratorCli(OrchestratorClientMixin, MgrModule, d.lsm_data.get('transport', ''), d.lsm_data.get('rpm', ''), d.device_id, - format_dimless(d.sys_api.get('size', 0), 5), + format_bytes(d.sys_api.get('size', 0), 5), d.lsm_data.get('health', ''), display_map[led_ident], display_map[led_fail], @@ -681,7 +681,7 @@ class OrchestratorCli(OrchestratorClientMixin, MgrModule, d.path, d.human_readable_type, d.device_id, - format_dimless(d.sys_api.get('size', 0), 5), + format_bytes(d.sys_api.get('size', 0), 5), display_map[d.available], nice_delta(now, d.created, ' ago'), ', '.join(d.rejected_reasons)