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

1 files changed, 7 insertions, 7 deletions

diff --git a/cinder/backup/drivers/ceph.py b/cinder/backup/drivers/ceph.py
index 248120910..285f53be5 100644
--- a/cinder/backup/drivers/ceph.py
+++ b/cinder/backup/drivers/ceph.py
@@ -631,15 +631,15 @@ class CephBackupDriver(driver.BackupDriver):
                                         base_name, read_only=True))
         try:
             snaps = base_rbd.list_snaps()
-        finally:
-            base_rbd.close()
 
-        if snaps is None:
-            return False
+            if snaps is None:
+                return False
 
-        for snap in snaps:
-            if snap['name'] == snap_name:
-                return True
+            for snap in snaps:
+                if snap['name'] == snap_name:
+                    return True
+        finally:
+            base_rbd.close()
 
         return False