openstack
/
cinder
Code Issues Proposed changes

Merge "Soft delete tmp migration volume"

This commit is contained in:
Jenkins 2013-09-23 01:37:07 +00:00 committed by Gerrit Code Review
parent 4925c1a73a d2479f1e88
commit 060b9d35a2
3 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cinder/db/sqlalchemy/api.py
View File

@ -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

2
cinder/tests/db/test_finish_migration.py
View File

@ -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'])

1
cinder/volume/manager.py
View File

@ -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']