openstack
/
compute-hyperv
Code Issues Proposed changes

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
(cherry picked from commit d9c1cb6aa1)
This commit is contained in:
Lucian Petrut 2019-08-22 17:20:10 +03:00
parent 51adc6e2bf
commit 6af9809f56
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
compute_hyperv/nova/cluster/livemigrationops.py
View File

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

1
compute_hyperv/tests/unit/cluster/test_livemigrationops.py
View File

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