Skip to content

Commit c0e05bf

Browse files
committed
ceph-volume: drop unnecessary call to get_single_lv()
`Zap.zap_lv()` currently makes a call to `get_single_lv()`: ``` lv = api.get_single_lv(filters={'lv_name': device.lv_name, 'vg_name': device.vg_name}) ``` this isn't needed and redundant as zap_lv() takes an instance of `Device()` as argument which has already a `lv_api` attribute: class Device in device.py: ``` else: vgname, lvname = self.path.split('/') filters = {'lv_name': lvname, 'vg_name': vgname} lv = lvm.get_single_lv(filters=filters) # <---- same call if lv: self.lv_api = lv ``` This implies a duplicate call to `subprocess.Popen()` unnecessarily. Fixes: https://tracker.ceph.com/issues/68312 Signed-off-by: Guillaume Abrioux <[email protected]>
1 parent 41f803a commit c0e05bf

File tree

1 file changed

+1
-2
lines changed
  • src/ceph-volume/ceph_volume/devices/lvm

1 file changed

+1
-2
lines changed

src/ceph-volume/ceph_volume/devices/lvm/zap.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,8 +191,7 @@ def zap_lv(self, device):
191191
Device examples: vg-name/lv-name, /dev/vg-name/lv-name
192192
Requirements: Must be a logical volume (LV)
193193
"""
194-
lv = api.get_single_lv(filters={'lv_name': device.lv_name, 'vg_name':
195-
device.vg_name})
194+
lv: api.Volume = device.lv_api
196195
self.unmount_lv(lv)
197196

198197
zap_device(device.path)

0 commit comments

Comments
 (0)