From: Andrew Schoen Date: Thu, 6 Dec 2018 16:49:03 +0000 (-0600) Subject: ceph-volume: use Device.lvm_size in batch strategy validators X-Git-Tag: v14.1.0~668^2~3 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=aaa915cfe6678d5326b2c15730febfff79e40463;p=ceph.git ceph-volume: use Device.lvm_size in batch strategy validators This will validate the devices on the size that lvm will allow to be used, not the raw physical size of the device. Signed-off-by: Andrew Schoen --- diff --git a/src/ceph-volume/ceph_volume/devices/lvm/strategies/validators.py b/src/ceph-volume/ceph_volume/devices/lvm/strategies/validators.py index 6b8938720963..3d01e5778370 100644 --- a/src/ceph-volume/ceph_volume/devices/lvm/strategies/validators.py +++ b/src/ceph-volume/ceph_volume/devices/lvm/strategies/validators.py @@ -9,7 +9,7 @@ def minimum_device_size(devices, osds_per_device=1): """ msg = 'Unable to use device %s %s, LVs would be smaller than 5GB' for device in devices: - device_size = disk.Size(b=device.sys_api['size']) + device_size = disk.Size(b=device.lvm_size.b) lv_size = device_size / osds_per_device if lv_size < disk.Size(gb=5): raise RuntimeError(msg % (device_size, device.path)) @@ -22,7 +22,7 @@ def minimum_device_collocated_size(devices, journal_size, osds_per_device=1): """ msg = 'Unable to use device %s %s, LVs would be smaller than 5GB' for device in devices: - device_size = disk.Size(b=device.sys_api['size']) + device_size = disk.Size(b=device.lvm_size.b) lv_size = (device_size / osds_per_device) - journal_size if lv_size < disk.Size(gb=5): raise RuntimeError(msg % (device_size, device.path))