Skip to content

Commit

Permalink
Merge pull request ceph#33337 from jan--f/wip-44153-nautilus
Browse files Browse the repository at this point in the history
nautilus: ceph-volume: don't remove vg twice when zapping filestore
  • Loading branch information
jan--f committed Feb 14, 2020
2 parents 5410fcd + 104f6ca commit 21a2166
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions src/ceph-volume/ceph_volume/devices/lvm/zap.py
Expand Up @@ -227,8 +227,10 @@ def zap_lvm_member(self, device):
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)



Expand Down

0 comments on commit 21a2166

Please sign in to comment.