From 76c4753e2c70abd4d62c5bfa7867e7d876cd1ad5 Mon Sep 17 00:00:00 2001 From: Satoru Takeuchi Date: Fri, 22 May 2020 01:07:17 +0000 Subject: [PATCH] ceph-volume: cleanup code Simplify the logic and fix a typo. Signed-off-by: Satoru Takeuchi (cherry picked from commit 0169b72fff48134ef01802ade38c55281b9f4510) Conflicts: src/ceph-volume/ceph_volume/util/device.py Accept incoming change on octopus --- src/ceph-volume/ceph_volume/util/device.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/ceph-volume/ceph_volume/util/device.py b/src/ceph-volume/ceph_volume/util/device.py index 878a584ce690..894f5d0d95f7 100644 --- a/src/ceph-volume/ceph_volume/util/device.py +++ b/src/ceph-volume/ceph_volume/util/device.py @@ -393,7 +393,7 @@ class Device(object): ] rejected = [reason for (k, v, reason) in reasons if self.sys_api.get(k, '') == v] - # reject disks small than 5GB + # reject disks smaller than 5GB if int(self.sys_api.get('size', 0)) < 5368709120: rejected.append('Insufficient space (<5GB)') if self.is_ceph_disk_member: @@ -403,10 +403,15 @@ class Device(object): return rejected def _check_lvm_reject_reasons(self): - rejected = self._check_generic_reject_reasons() - available_vgs = [vg for vg in self.vgs if vg.free >= 5368709120] - if self.vgs and not available_vgs: - rejected.append('Insufficient space (<5GB) on vgs') + rejected = [] + if self.vgs: + available_vgs = [vg for vg in self.vgs if vg.free >= 5368709120] + if not available_vgs: + rejected.append('Insufficient space (<5GB) on vgs') + else: + # only check generic if no vgs are present. Vgs might hold lvs and + # that might cause 'locked' to trigger + rejected.extend(self._check_generic_reject_reasons()) return len(rejected) == 0, rejected -- 2.47.3