From 3c63bee843d93ae4993e852ad9e8336c5e6cbb86 Mon Sep 17 00:00:00 2001 From: Jan Fajerski Date: Thu, 13 Feb 2020 17:09:44 +0100 Subject: [PATCH] ceph-volume: avoid calling zap_lv with a LV-less VG Fixes: https://tracker.ceph.com/issues/44125 Signed-off-by: Jan Fajerski (cherry picked from commit ad0dea53b8585d8397bf3069b1b39f13b6e0a8ce) --- src/ceph-volume/ceph_volume/devices/lvm/zap.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/ceph-volume/ceph_volume/devices/lvm/zap.py b/src/ceph-volume/ceph_volume/devices/lvm/zap.py index 6e60614088d0f..6ccc3892d26be 100644 --- a/src/ceph-volume/ceph_volume/devices/lvm/zap.py +++ b/src/ceph-volume/ceph_volume/devices/lvm/zap.py @@ -223,7 +223,13 @@ class Zap(object): Requirements: An LV or VG present in the device, making it an LVM member """ for lv in device.lvs: - self.zap_lv(Device(lv.lv_path)) + if lv.lv_name: + mlogger.info('Zapping lvm member {}. lv_path is {}'.format(device.abspath, lv.lv_path)) + self.zap_lv(Device(lv.lv_path)) + else: + mlogger.info('Found empty VG {}, removing'.format(lv.vg_name)) + api.remove_vg(lv.vg_name) + def zap_raw_device(self, device): -- 2.39.5