diff --git a/cinder/db/sqlalchemy/api.py b/cinder/db/sqlalchemy/api.py index 8de30757c06..79aa0b4b710 100644 --- a/cinder/db/sqlalchemy/api.py +++ b/cinder/db/sqlalchemy/api.py @@ -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 diff --git a/cinder/tests/db/test_finish_migration.py b/cinder/tests/db/test_finish_migration.py index 459dfea6226..4fba2a91fe9 100644 --- a/cinder/tests/db/test_finish_migration.py +++ b/cinder/tests/db/test_finish_migration.py @@ -44,8 +44,6 @@ def test_finish_volume_migration(self): 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']) diff --git a/cinder/volume/manager.py b/cinder/volume/manager.py index 54ac3825b35..46aac1fdc8c 100644 --- a/cinder/volume/manager.py +++ b/cinder/volume/manager.py @@ -705,6 +705,7 @@ def migrate_volume_completion(self, ctxt, volume_id, new_volume_id, 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']