openstack/cinder
Code Issues Proposed changes

Merge "Fix message confusion during backup restore"

Browse Source
This commit is contained in:
Zuul 2024-02-16 17:19:00 +00:00 committed by Gerrit Code Review
commit 31b90d75e1
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cinder/volume/flows/manager/create_volume.py
View File

@ -1149,6 +1149,10 @@ class CreateVolumeFromSpecTask(flow_utils.CinderTask):
try:
ret = self.driver.create_volume_from_backup(volume, backup)
need_update_volume = True
LOG.info("Created volume %(volume_id)s from backup %(backup_id)s "
"successfully.",
{'volume_id': volume.id,
'backup_id': backup_id})
except NotImplementedError:
LOG.info("Backend does not support creating volume from "
@ -1170,15 +1174,15 @@ class CreateVolumeFromSpecTask(flow_utils.CinderTask):
backup.update(updates)
backup.save()
LOG.info("Raw volume %(volume_id)s created. Calling "
"restore_backup %(backup_id)s to complete restoration.",
{'volume_id': volume.id,
'backup_id': backup_id})
backuprpcapi = backup_rpcapi.BackupAPI()
backuprpcapi.restore_backup(context, backup.host, backup,
volume.id, volume_is_new=True)
need_update_volume = False
LOG.info("Created volume %(volume_id)s from backup %(backup_id)s "
"successfully.",
{'volume_id': volume.id,
'backup_id': backup_id})
return ret, need_update_volume
def _create_raw_volume(self,