From 641278910870c177ce44a63a70146aee96d0e0b9 Mon Sep 17 00:00:00 2001 From: Jan Fajerski Date: Fri, 14 Feb 2020 14:10:36 +0100 Subject: [PATCH] ceph-volume: don't remove vg twice when zapping filestore Signed-off-by: Jan Fajerski Fixes: https://tracker.ceph.com/issues/44149 (cherry picked from commit bccdf6eafaf851d5092bb99d61edd44cd36d9dd2) --- src/ceph-volume/ceph_volume/devices/lvm/zap.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/ceph-volume/ceph_volume/devices/lvm/zap.py b/src/ceph-volume/ceph_volume/devices/lvm/zap.py index 6ccc3892d26be..ec579a1452cf9 100644 --- a/src/ceph-volume/ceph_volume/devices/lvm/zap.py +++ b/src/ceph-volume/ceph_volume/devices/lvm/zap.py @@ -227,8 +227,10 @@ class Zap(object): 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) + vg = api.get_first_vg(filters={'vg_name': lv.vg_name}) + if vg: + mlogger.info('Found empty VG {}, removing'.format(vg.vg_name)) + api.remove_vg(vg.vg_name) -- 2.39.5