From: Satoru Takeuchi Date: Fri, 22 May 2020 01:07:17 +0000 (+0000) Subject: ceph-volume: cleanup code X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=a6392736d38db55980ade3bc24bd9c9f5f509452;p=ceph.git ceph-volume: cleanup code Simplify the logic and fix a typo. Signed-off-by: Satoru Takeuchi (cherry picked from commit 0169b72fff48134ef01802ade38c55281b9f4510) --- diff --git a/src/ceph-volume/ceph_volume/util/device.py b/src/ceph-volume/ceph_volume/util/device.py index 4da4257512c73..f0c46a49b495f 100644 --- a/src/ceph-volume/ceph_volume/util/device.py +++ b/src/ceph-volume/ceph_volume/util/device.py @@ -388,7 +388,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: @@ -399,11 +399,11 @@ class Device(object): def _check_lvm_reject_reasons(self): rejected = [] - 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') - - if not self.vgs: + 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())