Skip to content

Commit

Permalink
ceph-volume: fix tags dict output in lvm list
Browse files Browse the repository at this point in the history 
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 <gabrioux@redhat.com>
  • Loading branch information
@guits
guits committed Dec 7, 2021
1 parent 6628f44 commit c24d366
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 5 deletions.
1 change: 1 addition & 0 deletions src/ceph-volume/ceph_volume/devices/lvm/batch.py
View file
Expand Up @@ -270,6 +270,7 @@ def __init__(self, argv):
'--crush-device-class',
dest='crush_device_class',
help='Crush device class to assign this OSD to',
default=""
)
parser.add_argument(
'--no-systemd',
Expand Down
2 changes: 1 addition & 1 deletion src/ceph-volume/ceph_volume/devices/lvm/common.py
View file
Expand Up @@ -71,7 +71,7 @@ def rollback_osd(args, osd_id=None):
'--crush-device-class': {
'dest': 'crush_device_class',
'help': 'Crush device class to assign this OSD to',
'default': None,
'default': "",
},
'--dmcrypt': {
'action': 'store_true',
Expand Down
1 change: 1 addition & 0 deletions src/ceph-volume/ceph_volume/devices/raw/common.py
View file
Expand Up @@ -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',
Expand Down
8 changes: 4 additions & 4 deletions src/ceph-volume/ceph_volume/tests/devices/lvm/test_activate.py
View file
Expand Up @@ -391,7 +391,7 @@ def test_detects_osds_to_activate_no_systemd(self, is_root, capture, monkeypatch
{
"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",
Expand All @@ -401,7 +401,7 @@ def test_detects_osds_to_activate_no_systemd(self, is_root, capture, monkeypatch
"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",
Expand All @@ -415,7 +415,7 @@ def test_detects_osds_to_activate_no_systemd(self, is_root, capture, monkeypatch
{
"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",
Expand All @@ -425,7 +425,7 @@ def test_detects_osds_to_activate_no_systemd(self, is_root, capture, monkeypatch
"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",
Expand Down

0 comments on commit c24d366

Please sign in to comment.