openstack
/
cinder
Code Issues Proposed changes

Merge "Ceph: Fix restoring old backups to a different backend" into stable/2023.2

This commit is contained in:
Zuul 2024-02-26 19:10:50 +00:00 committed by Gerrit Code Review
parent 6abf43c220 5d24ae2718
commit 539d872525
2 changed files with 62 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -976,7 +976,6 @@ class CephBackupDriver(driver.BackupDriver):
if len(snaps) > 1:
msg = (_("Backup should only have one snapshot but instead has %s")
% len(snaps))
LOG.error(msg)
raise exception.BackupOperationError(msg)
LOG.debug("Found snapshot '%s'", snaps[0])
@ -1109,11 +1108,43 @@ class CephBackupDriver(driver.BackupDriver):
backup_name = self._get_backup_base_name(backup.volume_id,
backup=backup)
# Retrieve backup volume
src_rbd = eventlet.tpool.Proxy(self.rbd.Image(client.ioctx,
backup_name,
snapshot=src_snap,
read_only=True))
try:
# Retrieve backup volume
_src = src_snap
src_rbd = eventlet.tpool.Proxy(self.rbd.Image(client.ioctx,
backup_name,
snapshot=_src,
read_only=True))
except rbd.ImageNotFound:
# Check for another base name as a fallback mechanism, in case
# the backup image is not found under the expected name.
# The main reason behind having two different base name formats
# is due to a change in the naming convention at some point in
# the history of the Cinder project.
# This approach ensures backward compatibility and makes it
# possible to restore older backups that were created before
# the change.
tried_name = backup_name
if backup.snapshot_id:
backup_name = self._get_backup_base_name(backup.volume_id,
backup=backup)
else:
backup_name = self._get_backup_base_name(backup.volume_id)
msg = (_("Backup %(backup_id)s of volume %(volume_id)s"
" not found with name %(tried_name)s,"
" trying a legacy name %(next_name)s.") %
{'backup_id': backup.id,
'volume_id': backup.volume_id,
'tried_name': tried_name,
'next_name': backup_name})
LOG.info(msg)
src_rbd = eventlet.tpool.Proxy(self.rbd.Image(
client.ioctx,
backup_name,
snapshot=_src,
read_only=True))
try:
rbd_meta = linuxrbd.RBDImageMetadata(src_rbd,
backup.container,
@ -1354,7 +1385,6 @@ class CephBackupDriver(driver.BackupDriver):
backup.volume_id)
except exception.BackupMetadataUnsupportedVersion:
msg = _("Metadata restore failed due to incompatible version")
LOG.error(msg)
raise exception.BackupOperationError(msg)
def restore(self,

25
cinder/tests/unit/backup/drivers/test_backup_ceph.py
View File

@ -998,6 +998,31 @@ class BackupCephTestCase(test.TestCase):
mock_getbasename.assert_called_once_with(self.volume_id)
mock_transfer_data.assert_called_once()
@common_mocks
def test_full_restore_with_image_not_found(self):
length = 1024
volume_is_new = True
src_snap = None
with tempfile.NamedTemporaryFile() as dest_file:
with mock.patch.object(self.service,
'_get_backup_base_name') as mock_name,\
mock.patch('eventlet.tpool.Proxy') as mock_proxy:
self.mock_rbd.Image.side_effect = self.mock_rbd.ImageNotFound
self.assertRaises(self.mock_rbd.ImageNotFound,
self.service._full_restore,
self.backup,
dest_file,
length,
volume_is_new,
src_snap)
# Check that the _get_backup_base_name was called
# twice due to the exception
self.assertEqual(mock_name.call_count, 2)
self.assertEqual(mock_proxy.call_count, 2)
@common_mocks
def test_discard_bytes(self):
# Lower the chunksize to a memory manageable number