From ee46b124ef320acad6c03571548ce573ce3f9dfd Mon Sep 17 00:00:00 2001 From: Rishabh Dave Date: Tue, 3 Sep 2019 18:36:23 +0530 Subject: [PATCH] api/lvm: rewrite a condition Create the list of logical volumes if the list passed in arguments is empty and rewrite the condition to make it more readable. Fixes: https://tracker.ceph.com/issues/41649 Signed-off-by: Rishabh Dave (cherry picked from commit d1f1bfd3635501090f4069be59e0bcde94dd64ec) --- src/ceph-volume/ceph_volume/api/lvm.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/ceph-volume/ceph_volume/api/lvm.py b/src/ceph-volume/ceph_volume/api/lvm.py index 92ac2c2283db0..f4f3d6cf5eb11 100644 --- a/src/ceph-volume/ceph_volume/api/lvm.py +++ b/src/ceph-volume/ceph_volume/api/lvm.py @@ -274,7 +274,9 @@ def is_lv(dev, lvs=None): splitname = dmsetup_splitname(dev) # Allowing to optionally pass `lvs` can help reduce repetitive checks for # multiple devices at once. - lvs = lvs if lvs is not None else Volumes() + if lvs is None or len(lvs) == 0: + lvs = Volumes() + if splitname.get('LV_NAME'): lvs.filter(lv_name=splitname['LV_NAME'], vg_name=splitname['VG_NAME']) return len(lvs) > 0 -- 2.39.5