openstack/nova
Code Issues Proposed changes

Merge "Object: Fix wrong usage migrate_data_obj"

Browse Source
This commit is contained in:
Jenkins 2016-01-27 12:46:24 +00:00 committed by Gerrit Code Review
commit 0c6fd94ded
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nova/compute/manager.py
View File

@ -5187,8 +5187,8 @@ class ComputeManager(manager.Manager):
context, instance,
block_migration, disk, dest, migrate_data)
migrate_data['pre_live_migration_result'] = pre_migration_data
migrate_data_obj = self._get_migrate_data_obj()
migrate_data_obj.from_legacy_dict(migrate_data)
migrate_data_object = self._get_migrate_data_obj()
migrate_data_object.from_legacy_dict(migrate_data)
except Exception:
with excutils.save_and_reraise_exception():
LOG.exception(_LE('Pre live migration failed at %s'),
@ -5199,12 +5199,12 @@ class ComputeManager(manager.Manager):
self._set_migration_status(migration, 'running')
migrate_data_obj.migration = migration
migrate_data_object.migration = migration
try:
self.driver.live_migration(context, instance, dest,
self._post_live_migration,
self._rollback_live_migration,
block_migration, migrate_data_obj)
block_migration, migrate_data_object)
except Exception:
# Executing live migration
# live_migration might raises exceptions, but
@ -5261,7 +5261,7 @@ class ComputeManager(manager.Manager):
# block storage or instance path were shared
is_shared_block_storage = not block_migration
is_shared_instance_path = not block_migration
if isinstance(migrate_data, objects.LibvirtLiveMigrateData):
if isinstance(migrate_data, migrate_data_obj.LibvirtLiveMigrateData):
is_shared_block_storage = migrate_data.is_shared_block_storage
is_shared_instance_path = migrate_data.is_shared_instance_path

1
nova/objects/__init__.py
View File

@ -48,6 +48,7 @@ def register_all():
__import__('nova.objects.instance_numa_topology')
__import__('nova.objects.instance_pci_requests')
__import__('nova.objects.keypair')
__import__('nova.objects.migrate_data')
__import__('nova.objects.migration')
__import__('nova.objects.migration_context')
__import__('nova.objects.monitor_metric')

2
nova/virt/libvirt/driver.py
View File

@ -5401,7 +5401,7 @@ class LibvirtDriver(driver.ComputeDriver):
source = CONF.host
if not isinstance(dest_check_data, migrate_data_obj.LiveMigrateData):
md_obj = migrate_data_obj.LibvirtLiveMigrateData()
md_obj = objects.LibvirtLiveMigrateData()
md_obj.from_legacy_dict(dest_check_data)
dest_check_data = md_obj

4
nova/virt/xenapi/vmops.py
View File

@ -2144,7 +2144,7 @@ class VMOps(object):
:param disk_over_commit: if true, allow disk over commit
"""
dest_check_data = migrate_data_obj.XenapiLiveMigrateData()
dest_check_data = objects.XenapiLiveMigrateData()
if block_migration:
dest_check_data.block_migration = True
dest_check_data.migrate_send_data = self._migrate_receive(ctxt)
@ -2191,7 +2191,7 @@ class VMOps(object):
'relax-xsm-sr-check=true required'))
if not isinstance(dest_check_data, migrate_data_obj.LiveMigrateData):
obj = migrate_data_obj.XenapiLiveMigrateData()
obj = objects.XenapiLiveMigrateData()
obj.from_legacy_dict(dest_check_data)
dest_check_data = obj