From 401bb755020bc0962a2a8038d626b3bc4ec4fff4 Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Tue, 7 Nov 2023 14:39:50 +0100 Subject: [PATCH] ceph-volume: Revert "ceph-volume: fix raw list for lvm devices" This reverts commit e5e429617c1c27dcd631171f65d30571e32f7266. This commit introduced a regression, see linked tracker for details. Fixes: https://tracker.ceph.com/issues/63391 Signed-off-by: Guillaume Abrioux (cherry picked from commit 916a22ef031953056771eceb1f49cab7eb746978) --- src/ceph-volume/ceph_volume/devices/raw/list.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/ceph-volume/ceph_volume/devices/raw/list.py b/src/ceph-volume/ceph_volume/devices/raw/list.py index 0f801701b80..c86353b90ec 100644 --- a/src/ceph-volume/ceph_volume/devices/raw/list.py +++ b/src/ceph-volume/ceph_volume/devices/raw/list.py @@ -69,7 +69,7 @@ class List(object): def generate(self, devs=None): logger.debug('Listing block devices via lsblk...') info_devices = disk.lsblk_all(abspath=True) - if devs is None or devs == []: + if not devs or not any(devs): # If no devs are given initially, we want to list ALL devices including children and # parents. Parent disks with child partitions may be the appropriate device to return if # the parent disk has a bluestore header, but children may be the most appropriate @@ -89,9 +89,6 @@ class List(object): # determine whether a parent is bluestore, we should err on the side of not reporting # the child so as not to give a false negative. info_device = [info for info in info_devices if info['NAME'] == dev][0] - if info_device['TYPE'] == 'lvm': - # lvm devices are not raw devices - continue if 'PKNAME' in info_device and info_device['PKNAME'] != "": parent = info_device['PKNAME'] try: -- 2.39.5