Allocations leaked during migration rollback
Allocations committed against the destination host are not reverted during live migration rollbacks. The reason is that we're not passing the migrate data object properly. At some point, the rollback callback signature has changed. We picked it up but only for the main (non-cluster) driver: I5f247d733642464f4ede0430d4dfc8a27a02e7fd This change addresses the cluster driver as well. Change-Id: I8c509d411b8fdf7e65622f1fbb2095fe9c3b98b5 Closes-Bug: #1841068
This commit is contained in:
parent
cb203978f2
commit
d9c1cb6aa1
|
@ -79,8 +79,7 @@ class ClusterLiveMigrationOps(livemigrationops.LiveMigrationOps):
|
|||
|
||||
LOG.debug("Calling live migration recover_method "
|
||||
"for instance.", instance=instance_ref)
|
||||
recover_method(context, instance_ref, dest, block_migration,
|
||||
migrate_data)
|
||||
recover_method(context, instance_ref, dest, migrate_data)
|
||||
|
||||
LOG.debug("Calling live migration post_method for instance.",
|
||||
instance=instance_ref)
|
||||
|
|
|
@ -100,7 +100,6 @@ class ClusterLiveMigrationOpsTestCase(test_base.HyperVBaseTestCase):
|
|||
|
||||
recover_method.assert_called_once_with(
|
||||
self._fake_context, mock_instance, dest,
|
||||
mock.sentinel.block_migration,
|
||||
mock.sentinel.migrate_data)
|
||||
|
||||
@mock.patch.object(base_livemigrationops.LiveMigrationOps,
|
||||
|
|
Loading…
Reference in New Issue