]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/orchestrator: fix device size in `orch device ls` output 50899/head
authorAdam King <adking@redhat.com>
Thu, 17 Nov 2022 18:14:55 +0000 (13:14 -0500)
committerAdam King <adking@redhat.com>
Wed, 5 Apr 2023 19:33:58 +0000 (15:33 -0400)
Fixes: https://tracker.ceph.com/issues/58045
Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit 7e576185ac87877e4d626c09bdef34e194042778)

src/pybind/mgr/orchestrator/module.py

index 73bd137484db6eb7e39c52097aee5e31bddd2238..448474435533be623eeb366095023ed805e0fe1c 100644 (file)
@@ -20,7 +20,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
 
@@ -536,7 +536,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],
@@ -552,7 +552,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)