From e85ce5497f0d960908d703104f9a9a0077142559 Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Mon, 6 Dec 2021 11:12:16 +0100 Subject: [PATCH] ceph-volume: fix tags dict output in `lvm list` Default value for `--crush-device-class` is `None`. When not passing this parameter, ceph-volume sets the value "None" in the lv tags. Therefore, ceph-volume will output that value with calling `ceph-volume lvm list --format json` For instance: ``` "1": [ { "devices": [ "/dev/sdc" ], "lv_name": "osd-data-5a4a34f5-5733-4c69-b439-edb48e31a45f", "lv_path": "/dev/ceph-aeb16fc3-9ac2-4126-ab66-bf920d101ea4/osd-data-5a4a34f5-5733-4c69-b439-edb48e31a45f", "lv_size": "49.00g", "lv_tags": "ceph.block_device=/dev/ceph-aeb16fc3-9ac2-4126-ab66-bf920d101ea4/osd-data-5a4a34f5-5733-4c69-b439-edb48e31a45f,ceph.block_uuid=E9hZNU-80Zz-PiER-iWN3-jSIU-krEN-khwU3x,ceph.cephx_lockbox_secret=,ceph.cluster_fsid=40fe4af5-0408-444b-843c-0926d550d1f1,ceph.cluster_name=ceph,ceph.crush_device_class=None,ceph.encrypted=0,ceph.osd_fsid=39680838-19df-4e50-9bb6-46b093d5b52b,ceph.osd_id=1,ceph.type=block,ceph.vdo=0", "lv_uuid": "E9hZNU-80Zz-PiER-iWN3-jSIU-krEN-khwU3x", "name": "osd-data-5a4a34f5-5733-4c69-b439-edb48e31a45f", "path": "/dev/ceph-aeb16fc3-9ac2-4126-ab66-bf920d101ea4/osd-data-5a4a34f5-5733-4c69-b439-edb48e31a45f", "tags": { "ceph.block_device": "/dev/ceph-aeb16fc3-9ac2-4126-ab66-bf920d101ea4/osd-data-5a4a34f5-5733-4c69-b439-edb48e31a45f", "ceph.block_uuid": "E9hZNU-80Zz-PiER-iWN3-jSIU-krEN-khwU3x", "ceph.cephx_lockbox_secret": "", "ceph.cluster_fsid": "40fe4af5-0408-444b-843c-0926d550d1f1", "ceph.cluster_name": "ceph", "ceph.crush_device_class": "None", ``` ceph-volume should print `"ceph.crush_device_class": "",` instead of `"ceph.crush_device_class": "None",` Fixes: https://tracker.ceph.com/issues/53425 Signed-off-by: Guillaume Abrioux (cherry picked from commit c24d3666c00f474b3026ff273ce27d77e76f6552) --- src/ceph-volume/ceph_volume/devices/lvm/batch.py | 1 + src/ceph-volume/ceph_volume/devices/lvm/common.py | 2 +- src/ceph-volume/ceph_volume/devices/raw/common.py | 1 + .../ceph_volume/tests/devices/lvm/test_activate.py | 8 ++++---- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/ceph-volume/ceph_volume/devices/lvm/batch.py b/src/ceph-volume/ceph_volume/devices/lvm/batch.py index c1b23b448eff..11ec5947c24f 100644 --- a/src/ceph-volume/ceph_volume/devices/lvm/batch.py +++ b/src/ceph-volume/ceph_volume/devices/lvm/batch.py @@ -270,6 +270,7 @@ class Batch(object): '--crush-device-class', dest='crush_device_class', help='Crush device class to assign this OSD to', + default="" ) parser.add_argument( '--no-systemd', diff --git a/src/ceph-volume/ceph_volume/devices/lvm/common.py b/src/ceph-volume/ceph_volume/devices/lvm/common.py index 752f354f35aa..05f83383f0ea 100644 --- a/src/ceph-volume/ceph_volume/devices/lvm/common.py +++ b/src/ceph-volume/ceph_volume/devices/lvm/common.py @@ -71,7 +71,7 @@ common_args = { '--crush-device-class': { 'dest': 'crush_device_class', 'help': 'Crush device class to assign this OSD to', - 'default': None, + 'default': "", }, '--dmcrypt': { 'action': 'store_true', diff --git a/src/ceph-volume/ceph_volume/devices/raw/common.py b/src/ceph-volume/ceph_volume/devices/raw/common.py index 08cfd02890cb..54e77aca63ca 100644 --- a/src/ceph-volume/ceph_volume/devices/raw/common.py +++ b/src/ceph-volume/ceph_volume/devices/raw/common.py @@ -25,6 +25,7 @@ def create_parser(prog, description): '--crush-device-class', dest='crush_device_class', help='Crush device class to assign this OSD to', + default="" ) parser.add_argument( '--no-tmpfs', diff --git a/src/ceph-volume/ceph_volume/tests/devices/lvm/test_activate.py b/src/ceph-volume/ceph_volume/tests/devices/lvm/test_activate.py index 9b8fcbebeaef..3bcff05e085b 100644 --- a/src/ceph-volume/ceph_volume/tests/devices/lvm/test_activate.py +++ b/src/ceph-volume/ceph_volume/tests/devices/lvm/test_activate.py @@ -391,7 +391,7 @@ direct_report = { { "lv_name": "osd-block-957d22b7-24ce-466a-9883-b8218eaa1634", "lv_path": "/dev/ceph-d4962338-46ff-4cd5-8ea6-c033dbdc5b44/osd-block-957d22b7-24ce-466a-9883-b8218eaa1634", - "lv_tags": "ceph.block_device=/dev/ceph-d4962338-46ff-4cd5-8ea6-c033dbdc5b44/osd-block-957d22b7-24ce-466a-9883-b8218eaa1634,ceph.block_uuid=6MixOd-2Q1I-f8K3-PPOq-UJGV-L3A0-0XwUm4,ceph.cephx_lockbox_secret=,ceph.cluster_fsid=d4962338-46ff-4cd5-8ea6-c033dbdc5b44,ceph.cluster_name=ceph,ceph.crush_device_class=None,ceph.encrypted=0,ceph.osd_fsid=957d22b7-24ce-466a-9883-b8218eaa1634,ceph.osd_id=0,ceph.type=block", + "lv_tags": "ceph.block_device=/dev/ceph-d4962338-46ff-4cd5-8ea6-c033dbdc5b44/osd-block-957d22b7-24ce-466a-9883-b8218eaa1634,ceph.block_uuid=6MixOd-2Q1I-f8K3-PPOq-UJGV-L3A0-0XwUm4,ceph.cephx_lockbox_secret=,ceph.cluster_fsid=d4962338-46ff-4cd5-8ea6-c033dbdc5b44,ceph.cluster_name=ceph,ceph.crush_device_class=,ceph.encrypted=0,ceph.osd_fsid=957d22b7-24ce-466a-9883-b8218eaa1634,ceph.osd_id=0,ceph.type=block", "lv_uuid": "6MixOd-2Q1I-f8K3-PPOq-UJGV-L3A0-0XwUm4", "name": "osd-block-957d22b7-24ce-466a-9883-b8218eaa1634", "path": "/dev/ceph-d4962338-46ff-4cd5-8ea6-c033dbdc5b44/osd-block-957d22b7-24ce-466a-9883-b8218eaa1634", @@ -401,7 +401,7 @@ direct_report = { "ceph.cephx_lockbox_secret": "", "ceph.cluster_fsid": "d4962338-46ff-4cd5-8ea6-c033dbdc5b44", "ceph.cluster_name": "ceph", - "ceph.crush_device_class": "None", + "ceph.crush_device_class": "", "ceph.encrypted": "0", "ceph.osd_fsid": "957d22b7-24ce-466a-9883-b8218eaa1634", "ceph.osd_id": "0", @@ -415,7 +415,7 @@ direct_report = { { "lv_name": "osd-block-d0f3e4ad-e52a-4520-afc0-a8789a96ce8b", "lv_path": "/dev/ceph-7538bcf0-f155-4d3f-a9fd-d8b15905e532/osd-block-d0f3e4ad-e52a-4520-afc0-a8789a96ce8b", - "lv_tags": "ceph.block_device=/dev/ceph-7538bcf0-f155-4d3f-a9fd-d8b15905e532/osd-block-d0f3e4ad-e52a-4520-afc0-a8789a96ce8b,ceph.block_uuid=1igwLb-ZlmV-eLgp-hapx-c1Hr-M5gz-sHjnyW,ceph.cephx_lockbox_secret=,ceph.cluster_fsid=d4962338-46ff-4cd5-8ea6-c033dbdc5b44,ceph.cluster_name=ceph,ceph.crush_device_class=None,ceph.encrypted=0,ceph.osd_fsid=d0f3e4ad-e52a-4520-afc0-a8789a96ce8b,ceph.osd_id=1,ceph.type=block", + "lv_tags": "ceph.block_device=/dev/ceph-7538bcf0-f155-4d3f-a9fd-d8b15905e532/osd-block-d0f3e4ad-e52a-4520-afc0-a8789a96ce8b,ceph.block_uuid=1igwLb-ZlmV-eLgp-hapx-c1Hr-M5gz-sHjnyW,ceph.cephx_lockbox_secret=,ceph.cluster_fsid=d4962338-46ff-4cd5-8ea6-c033dbdc5b44,ceph.cluster_name=ceph,ceph.crush_device_class=,ceph.encrypted=0,ceph.osd_fsid=d0f3e4ad-e52a-4520-afc0-a8789a96ce8b,ceph.osd_id=1,ceph.type=block", "lv_uuid": "1igwLb-ZlmV-eLgp-hapx-c1Hr-M5gz-sHjnyW", "name": "osd-block-d0f3e4ad-e52a-4520-afc0-a8789a96ce8b", "path": "/dev/ceph-7538bcf0-f155-4d3f-a9fd-d8b15905e532/osd-block-d0f3e4ad-e52a-4520-afc0-a8789a96ce8b", @@ -425,7 +425,7 @@ direct_report = { "ceph.cephx_lockbox_secret": "", "ceph.cluster_fsid": "d4962338-46ff-4cd5-8ea6-c033dbdc5b44", "ceph.cluster_name": "ceph", - "ceph.crush_device_class": "None", + "ceph.crush_device_class": "", "ceph.encrypted": "0", "ceph.osd_fsid": "d0f3e4ad-e52a-4520-afc0-a8789a96ce8b", "ceph.osd_id": "1", -- 2.47.3