Merge "Fix ceph: only close rbd image after snapshot iteration is finished" into stable/rocky

This commit is contained in:
Zuul
2019-09-05 00:01:52 +00:00
committed by Gerrit Code Review

View File

@@ -631,16 +631,16 @@ class CephBackupDriver(driver.BackupDriver):
base_name, read_only=True))
try:
snaps = base_rbd.list_snaps()
if snaps is None:
return False
for snap in snaps:
if snap['name'] == snap_name:
return True
finally:
base_rbd.close()
if snaps is None:
return False
for snap in snaps:
if snap['name'] == snap_name:
return True
return False
def _backup_rbd(self, backup, volume_file, volume_name, length):