From: Guillaume Abrioux Date: Mon, 28 Mar 2022 22:01:39 +0000 (+0200) Subject: ceph-volume: do not leave pv when zapping osds X-Git-Tag: v16.2.11~576^2~1 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b35b0d6ce394485a29b7bc7bd7b3aa3d73e001f9;p=ceph.git ceph-volume: do not leave pv when zapping osds when zapping a device and no vg/lv are left, the pv should be removed too. Signed-off-by: Guillaume Abrioux (cherry picked from commit 7f007e7fc75b4d6e7465c684f7e5b2458883dcc5) --- diff --git a/src/ceph-volume/ceph_volume/devices/lvm/zap.py b/src/ceph-volume/ceph_volume/devices/lvm/zap.py index b259d6334923..6dcda140d642 100644 --- a/src/ceph-volume/ceph_volume/devices/lvm/zap.py +++ b/src/ceph-volume/ceph_volume/devices/lvm/zap.py @@ -169,6 +169,7 @@ class Zap(object): """ lv = api.get_single_lv(filters={'lv_name': device.lv_name, 'vg_name': device.vg_name}) + pv = api.get_single_pv(filters={'lv_uuid': lv.lv_uuid}) self.unmount_lv(lv) wipefs(device.abspath) @@ -183,6 +184,7 @@ class Zap(object): mlogger.info('Only 1 LV left in VG, will proceed to destroy ' 'volume group %s', device.vg_name) api.remove_vg(device.vg_name) + api.remove_pv(pv.pv_name) else: mlogger.info('More than 1 LV left in VG, will proceed to ' 'destroy LV only')