openstack
/
nova
Code Issues Proposed changes

Merge "Use migration_status during volume migrating and retyping"

This commit is contained in:
Zuul 2019-05-07 09:07:22 +00:00 committed by Gerrit Code Review
parent 517031b82c 53c3cfa7a0
commit 58a1fcc785
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nova/compute/manager.py
View File

@ -5964,9 +5964,9 @@ class ComputeManager(manager.Manager):
# new style attachments (v3.44). Once we drop support for old style
# attachments we could think about cleaning up the cinder-initiated
# swap volume API flows.
is_cinder_migration = (
True if old_volume['status'] in ('retyping',
'migrating') else False)
is_cinder_migration = False
if 'migration_status' in old_volume:
is_cinder_migration = old_volume['migration_status'] == 'migrating'
old_vol_size = old_volume['size']
new_volume = self.volume_api.get(context, new_volume_id)
new_vol_size = new_volume['size']

10
nova/tests/unit/compute/test_compute_mgr.py
View File

@ -2337,11 +2337,11 @@ class ComputeManagerUnitTestCase(test.NoDBTestCase,
connection_info='{"data": {}}', volume_size=1)
old_volume = {
'id': uuids.old_volume_id, 'size': 1, 'status': 'retyping',
'multiattach': False
'migration_status': 'migrating', 'multiattach': False
}
new_volume = {
'id': uuids.new_volume_id, 'size': 1, 'status': 'reserved',
'multiattach': False
'migration_status': 'migrating', 'multiattach': False
}
attachment_update.return_value = {"connection_info": {"data": {}}}
get_bdm.return_value = bdm
@ -2483,12 +2483,12 @@ class ComputeManagerUnitTestCase(test.NoDBTestCase,
attachment_id=uuids.old_attachment_id,
connection_info='{"data": {}}')
old_volume = {
'id': uuids.old_volume_id, 'size': 1, 'status': 'migrating',
'multiattach': False
'id': uuids.old_volume_id, 'size': 1, 'status': 'in-use',
'migration_status': 'migrating', 'multiattach': False
}
new_volume = {
'id': uuids.new_volume_id, 'size': 1, 'status': 'reserved',
'multiattach': False
'migration_status': 'migrating', 'multiattach': False
}
get_bdm.return_value = bdm
get_volume.side_effect = (old_volume, new_volume)

3
nova/volume/cinder.py
View File

@ -327,6 +327,9 @@ def _untranslate_volume_summary_view(context, vol):
d['shared_targets'] = vol.shared_targets
d['service_uuid'] = vol.service_uuid
if hasattr(vol, 'migration_status'):
d['migration_status'] = vol.migration_status
return d