summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2022-11-21 18:58:39 +0000
committerGerrit Code Review <review@openstack.org>2022-11-21 18:58:39 +0000
commit985dd613c57e82c9c2831aaaa640c507d1b2e610 (patch)
tree957b5765997dcdf62c1089ea55bd0e665d2c1900
parentea54727fd2600337e1a9f91a443feb3993a117f8 (diff)
parenta1dfa8b20b464c105eee1b328e09394db4b65b71 (diff)
downloadcinder-985dd613c57e82c9c2831aaaa640c507d1b2e610.tar.gz
Merge "[RBD] Fix snapshot backup name" into stable/ussuri
-rw-r--r--cinder/backup/drivers/ceph.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/cinder/backup/drivers/ceph.py b/cinder/backup/drivers/ceph.py
index 05c7a1589..18f63d798 100644
--- a/cinder/backup/drivers/ceph.py
+++ b/cinder/backup/drivers/ceph.py
@@ -819,7 +819,10 @@ class CephBackupDriver(driver.BackupDriver):
image.
"""
volume_id = backup.volume_id
- backup_name = self._get_backup_base_name(volume_id, backup=backup)
+ if backup.snapshot_id:
+ backup_name = self._get_backup_base_name(volume_id)
+ else:
+ backup_name = self._get_backup_base_name(volume_id, backup=backup)
with eventlet.tpool.Proxy(rbd_driver.RADOSClient(self,
backup.container)) as client: