Remove block_migration attribute from migration rollback call
In case of failed live migration of a VM, remove the block_migration attribute from being passed to _rollback_live_migration() method. This attribute isn’t required to be passed during the recover method invocation as part of migration failure. Change-Id: I5fb08612bab82ddbfd0f18634f2ee305c8ed80eb Closes-Bug: #1691079
This commit is contained in:
parent
6f6d30e35f
commit
b07ea6602d
@ -1769,7 +1769,7 @@ class TestPowerVMDriver(test.TestCase):
|
|||||||
'block_mig', 'migrate_data')
|
'block_mig', 'migrate_data')
|
||||||
self.lpm.migration_abort.assert_called_once_with()
|
self.lpm.migration_abort.assert_called_once_with()
|
||||||
mock_rec_meth.assert_called_once_with(
|
mock_rec_meth.assert_called_once_with(
|
||||||
'context', self.lpm_inst, 'dest', mock.ANY, mock.ANY)
|
'context', self.lpm_inst, 'dest', migrate_data=mock.ANY)
|
||||||
self.lpm.rollback_live_migration.assert_called_once_with('context')
|
self.lpm.rollback_live_migration.assert_called_once_with('context')
|
||||||
self.assertEqual(0, mock_post_meth.call_count)
|
self.assertEqual(0, mock_post_meth.call_count)
|
||||||
|
|
||||||
@ -1783,7 +1783,7 @@ class TestPowerVMDriver(test.TestCase):
|
|||||||
'context', self.lpm_inst, 'dest', mock_post_meth, mock_rec_meth,
|
'context', self.lpm_inst, 'dest', mock_post_meth, mock_rec_meth,
|
||||||
'block_mig', 'migrate_data')
|
'block_mig', 'migrate_data')
|
||||||
mock_rec_meth.assert_called_once_with(
|
mock_rec_meth.assert_called_once_with(
|
||||||
'context', self.lpm_inst, 'dest', mock.ANY, mock.ANY)
|
'context', self.lpm_inst, 'dest', migrate_data=mock.ANY)
|
||||||
self.lpm.rollback_live_migration.assert_called_once_with('context')
|
self.lpm.rollback_live_migration.assert_called_once_with('context')
|
||||||
self.assertEqual(0, mock_post_meth.call_count)
|
self.assertEqual(0, mock_post_meth.call_count)
|
||||||
|
|
||||||
@ -1799,7 +1799,7 @@ class TestPowerVMDriver(test.TestCase):
|
|||||||
'context', self.lpm_inst, 'dest', mock_post_meth, mock_rec_meth,
|
'context', self.lpm_inst, 'dest', mock_post_meth, mock_rec_meth,
|
||||||
'block_mig', 'migrate_data')
|
'block_mig', 'migrate_data')
|
||||||
mock_rec_meth.assert_called_once_with(
|
mock_rec_meth.assert_called_once_with(
|
||||||
'context', self.lpm_inst, 'dest', mock.ANY, mock.ANY)
|
'context', self.lpm_inst, 'dest', migrate_data=mock.ANY)
|
||||||
self.lpm.rollback_live_migration.assert_called_once_with('context')
|
self.lpm.rollback_live_migration.assert_called_once_with('context')
|
||||||
self.assertEqual(0, mock_post_meth.call_count)
|
self.assertEqual(0, mock_post_meth.call_count)
|
||||||
|
|
||||||
|
@ -1484,14 +1484,14 @@ class PowerVMDriver(driver.ComputeDriver):
|
|||||||
mig.migration_abort()
|
mig.migration_abort()
|
||||||
self._migration_exception_util(context, instance, dest,
|
self._migration_exception_util(context, instance, dest,
|
||||||
recover_method,
|
recover_method,
|
||||||
block_migration, migrate_data,
|
migrate_data,
|
||||||
mig, ex=timeout_ex)
|
mig, ex=timeout_ex)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
LOG.exception("PowerVM error during live migration.",
|
LOG.exception("PowerVM error during live migration.",
|
||||||
instance=instance)
|
instance=instance)
|
||||||
self._migration_exception_util(context, instance, dest,
|
self._migration_exception_util(context, instance, dest,
|
||||||
recover_method,
|
recover_method,
|
||||||
block_migration, migrate_data,
|
migrate_data,
|
||||||
mig, ex=e)
|
mig, ex=e)
|
||||||
|
|
||||||
LOG.debug("Calling post live migration method.", instance=instance)
|
LOG.debug("Calling post live migration method.", instance=instance)
|
||||||
@ -1502,8 +1502,7 @@ class PowerVMDriver(driver.ComputeDriver):
|
|||||||
del self.live_migrations[instance.uuid]
|
del self.live_migrations[instance.uuid]
|
||||||
|
|
||||||
def _migration_exception_util(self, context, instance, dest,
|
def _migration_exception_util(self, context, instance, dest,
|
||||||
recover_method, block_migration,
|
recover_method, migrate_data, mig, ex):
|
||||||
migrate_data, mig, ex):
|
|
||||||
"""Migration exception utility.
|
"""Migration exception utility.
|
||||||
|
|
||||||
:param context: security context
|
:param context: security context
|
||||||
@ -1514,7 +1513,6 @@ class PowerVMDriver(driver.ComputeDriver):
|
|||||||
:param recover_method:
|
:param recover_method:
|
||||||
recovery method when any exception occurs.
|
recovery method when any exception occurs.
|
||||||
expected nova.compute.manager._rollback_live_migration.
|
expected nova.compute.manager._rollback_live_migration.
|
||||||
:param block_migration: if true, migrate VM disk.
|
|
||||||
:param migrate_data: a LiveMigrateData object
|
:param migrate_data: a LiveMigrateData object
|
||||||
:param mig: live_migration object
|
:param mig: live_migration object
|
||||||
:param ex: exception reason
|
:param ex: exception reason
|
||||||
@ -1523,8 +1521,7 @@ class PowerVMDriver(driver.ComputeDriver):
|
|||||||
LOG.warning(_LW("Rolling back live migration."), instance=instance)
|
LOG.warning(_LW("Rolling back live migration."), instance=instance)
|
||||||
try:
|
try:
|
||||||
mig.rollback_live_migration(context)
|
mig.rollback_live_migration(context)
|
||||||
recover_method(context, instance, dest, block_migration,
|
recover_method(context, instance, dest, migrate_data=migrate_data)
|
||||||
migrate_data)
|
|
||||||
except Exception:
|
except Exception:
|
||||||
LOG.exception("PowerVM error rolling back live migration.",
|
LOG.exception("PowerVM error rolling back live migration.",
|
||||||
instance=instance)
|
instance=instance)
|
||||||
|
Loading…
Reference in New Issue
Block a user