Merge "Restore_backup: set error when volume status not matched"
This commit is contained in:
commit
526c1a7372
|
@ -466,6 +466,8 @@ class BackupManager(manager.ThreadPoolManager):
|
||||||
'actual_status': actual_status})
|
'actual_status': actual_status})
|
||||||
backup.status = fields.BackupStatus.AVAILABLE
|
backup.status = fields.BackupStatus.AVAILABLE
|
||||||
backup.save()
|
backup.save()
|
||||||
|
self.db.volume_update(context, volume_id,
|
||||||
|
{'status': 'error_restoring'})
|
||||||
raise exception.InvalidVolume(reason=err)
|
raise exception.InvalidVolume(reason=err)
|
||||||
|
|
||||||
expected_status = fields.BackupStatus.RESTORING
|
expected_status = fields.BackupStatus.RESTORING
|
||||||
|
|
|
@ -940,6 +940,8 @@ class BackupTestCase(BaseBackupTest):
|
||||||
backup,
|
backup,
|
||||||
vol_id)
|
vol_id)
|
||||||
backup = db.backup_get(self.ctxt, backup.id)
|
backup = db.backup_get(self.ctxt, backup.id)
|
||||||
|
vol = db.volume_get(self.ctxt, vol_id)
|
||||||
|
self.assertEqual('error_restoring', vol['status'])
|
||||||
self.assertEqual(fields.BackupStatus.AVAILABLE, backup['status'])
|
self.assertEqual(fields.BackupStatus.AVAILABLE, backup['status'])
|
||||||
|
|
||||||
def test_restore_backup_with_bad_backup_status(self):
|
def test_restore_backup_with_bad_backup_status(self):
|
||||||
|
|
Loading…
Reference in New Issue