openstack
/
cinder
Code Issues Proposed changes

Merge "Ceph backup: Close source file"

This commit is contained in:
Zuul 2022-09-20 15:53:39 +00:00 committed by Gerrit Code Review
parent 04075091d8 fc5307582a
commit 2912d643d1
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cinder/backup/drivers/ceph.py
View File

@ -889,17 +889,22 @@ class CephBackupDriver(driver.BackupDriver):
LOG.debug("Copying data from volume %s.", volume_id)
dest_rbd = eventlet.tpool.Proxy(self.rbd.Image(client.ioctx,
backup_name))
meta_io_proxy = None
try:
rbd_meta = linuxrbd.RBDImageMetadata(dest_rbd,
backup.container,
self._ceph_backup_user,
self._ceph_backup_conf)
rbd_fd = linuxrbd.RBDVolumeIOWrapper(rbd_meta)
self._transfer_data(src_volume, src_name,
eventlet.tpool.Proxy(rbd_fd),
meta_io_proxy = eventlet.tpool.Proxy(rbd_fd)
self._transfer_data(src_volume, src_name, meta_io_proxy,
backup_name, length)
finally:
dest_rbd.close()
# Closing the wrapper will close the image as well
if meta_io_proxy:
meta_io_proxy.close()
else:
dest_rbd.close()
@staticmethod
def backup_snapshot_name_pattern() -> str: