openstack/nova
Code Issues Proposed changes

Add functional test for forced live migration rollback allocs

Browse Source 
Per bug 1784022, it was not immediately clear that on a forced
host live migration failure that the allocations on the dest
host would be deleted and the original allocations for the instance
would be back on the source host, but it is indeed working but
as far as I could tell we didn't have a functional test for it,
only the non-forced case. So this change adds the force=True
wrinkle to the same existing functional test and also adds
assertions on where the allocations exist for the source and dest
nodes and the migration and instance records at the point of
failure.

Change-Id: Iaef9a4456c9c2bd9b2f4257b4ddd3efa3dea50f6
Related-Bug: #1784022
This commit is contained in:
Matt Riedemann
2018-07-27 14:31:22 -04:00
parent 6be7f7248f
commit 11f473b170
1 changed files with 37 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
nova/tests/functional/test_servers.py
View File

@@ -2831,14 +2831,9 @@ class ServerMovingTests(integrated_helpers.ProviderUsageBaseTestCase):
self._delete_and_check_allocations(server)
@mock.patch('nova.virt.fake.FakeDriver.pre_live_migration',
# The actual type of exception here doesn't matter. The point
# is that the virt driver raised an exception from the
# pre_live_migration method on the destination host.
side_effect=test.TestingException(
'test_live_migrate_rollback_cleans_dest_node_allocations'))
@mock.patch('nova.virt.fake.FakeDriver.pre_live_migration')
def test_live_migrate_rollback_cleans_dest_node_allocations(
self, mock_pre_live_migration):
self, mock_pre_live_migration, force=False):
"""Tests the case that when live migration fails, either during the
call to pre_live_migration on the destination, or during the actual
live migration in the virt driver, the allocations on the destination
@@ -2852,10 +2847,35 @@ class ServerMovingTests(integrated_helpers.ProviderUsageBaseTestCase):
server = self._boot_and_check_allocations(
self.flavor1, source_hostname)
def stub_pre_live_migration(context, instance, block_device_info,
network_info, disk_info, migrate_data):
# Make sure the source node allocations are against the migration
# record and the dest node allocations are against the instance.
_allocations = self._get_allocations_by_server_uuid(
migrate_data.migration.uuid)
self.assertEqual(1, len(_allocations))
self.assertIn(source_rp_uuid, _allocations)
self.assertFlavorMatchesAllocation(
self.flavor1, _allocations[source_rp_uuid]['resources'])
_allocations = self._get_allocations_by_server_uuid(server['id'])
self.assertEqual(1, len(_allocations))
self.assertIn(dest_rp_uuid, _allocations)
self.assertFlavorMatchesAllocation(
self.flavor1, _allocations[dest_rp_uuid]['resources'])
# The actual type of exception here doesn't matter. The point
# is that the virt driver raised an exception from the
# pre_live_migration method on the destination host.
raise test.TestingException(
'test_live_migrate_rollback_cleans_dest_node_allocations')
mock_pre_live_migration.side_effect = stub_pre_live_migration
post = {
'os-migrateLive': {
'host': dest_hostname,
'block_migration': True,
'force': force
}
}
self.api.post_server_action(server['id'], post)
@@ -2890,6 +2910,16 @@ class ServerMovingTests(integrated_helpers.ProviderUsageBaseTestCase):
self._delete_and_check_allocations(server)
def test_live_migrate_rollback_cleans_dest_node_allocations_forced(self):
"""Tests the case that when a forced host live migration fails, either
during the call to pre_live_migration on the destination, or during
the actual live migration in the virt driver, the allocations on the
destination node are rolled back since the instance is still on the
source node.
"""
self.test_live_migrate_rollback_cleans_dest_node_allocations(
force=True)
def test_rescheduling_when_migrating_instance(self):
"""Tests that allocations are removed from the destination node by
the compute service when a cold migrate / resize fails and a reschedule