Merge "Soft delete tmp migration volume"
This commit is contained in:
commit
060b9d35a2
@ -1119,9 +1119,6 @@ def finish_volume_migration(context, src_vol_id, dest_vol_id):
|
||||
session.query(models.Volume).\
|
||||
filter_by(id=src_vol_id).\
|
||||
update(updates)
|
||||
session.query(models.Volume).\
|
||||
filter_by(id=dest_vol_id).\
|
||||
delete()
|
||||
|
||||
|
||||
@require_admin_context
|
||||
|
@ -44,8 +44,6 @@ class FinishVolumeMigrationTestCase(test.TestCase):
|
||||
db.finish_volume_migration(ctxt, src_volume['id'],
|
||||
dest_volume['id'])
|
||||
|
||||
self.assertRaises(exception.VolumeNotFound, db.volume_get, ctxt,
|
||||
dest_volume['id'])
|
||||
src_volume = db.volume_get(ctxt, src_volume['id'])
|
||||
expected_name = 'volume-%s' % dest_volume['id']
|
||||
self.assertEqual(src_volume['_name_id'], dest_volume['id'])
|
||||
|
@ -721,6 +721,7 @@ class VolumeManager(manager.SchedulerDependentManager):
|
||||
LOG.error(msg % {'vol': volume_id, 'err': ex})
|
||||
|
||||
self.db.finish_volume_migration(ctxt, volume_id, new_volume_id)
|
||||
self.db.volume_destroy(ctxt, new_volume_id)
|
||||
self.db.volume_update(ctxt, volume_id, {'migration_status': None})
|
||||
return volume['id']
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user