Merge "Update usage in RT.drop_move_claim during confirm resize"

Author: Zuul

nova/compute/manager.py

@@ -4073,6 +4073,10 @@ def _confirm_resize(self, context, instance, migration=None):
         migration.status = 'confirmed'
         migration.save()
 
+        # NOTE(mriedem): drop_move_claim relies on
+        # instance.migration_context so make sure to not call
+        # instance.drop_migration_context() until after drop_move_claim
+        # is called.
         self.rt.drop_move_claim(context, instance, migration.source_node,
                                 old_instance_type, prefix='old_')
         instance.drop_migration_context()

nova/compute/resource_tracker.py

@@ -459,31 +459,27 @@ def drop_move_claim(self, context, instance, nodename,
                        attributes. 'old_' or 'new_', with 'new_' being the
                        default.
         """
+        # Remove usage for an instance that is tracked in migrations, such as
+        # on the dest node during revert resize.
         if instance['uuid'] in self.tracked_migrations:
             migration = self.tracked_migrations.pop(instance['uuid'])
-
             if not instance_type:
                 instance_type = self._get_instance_type(instance, prefix,
                                                         migration)
-
-            if instance_type is not None:
-                numa_topology = self._get_migration_context_resource(
-                    'numa_topology', instance, prefix=prefix)
-                usage = self._get_usage_dict(
-                        instance_type, instance, numa_topology=numa_topology)
-                self._drop_pci_devices(instance, nodename, prefix)
-                self._update_usage(usage, nodename, sign=-1)
-
-                ctxt = context.elevated()
-                self._update(ctxt, self.compute_nodes[nodename])
         # Remove usage for an instance that is not tracked in migrations (such
         # as on the source node after a migration).
         # NOTE(lbeliveau): On resize on the same node, the instance is
         # included in both tracked_migrations and tracked_instances.
-        elif (instance['uuid'] in self.tracked_instances):
+        elif instance['uuid'] in self.tracked_instances:
             self.tracked_instances.remove(instance['uuid'])
+
+        if instance_type is not None:
+            numa_topology = self._get_migration_context_resource(
+                'numa_topology', instance, prefix=prefix)
+            usage = self._get_usage_dict(
+                    instance_type, instance, numa_topology=numa_topology)
             self._drop_pci_devices(instance, nodename, prefix)
-            # TODO(lbeliveau): Validate if numa needs the same treatment.
+            self._update_usage(usage, nodename, sign=-1)
 
             ctxt = context.elevated()
             self._update(ctxt, self.compute_nodes[nodename])

nova/tests/functional/test_servers.py

@@ -2121,13 +2121,8 @@ def test_resize_confirm_assert_hypervisor_usage_no_periodics(self):
         self._wait_for_state_change(self.api, server, 'ACTIVE')
 
         # There should no resource usage for flavor1 on the source host.
-        # FIXME(mriedem): This is bug 1818914 where the source host continues
-        # to report old_flavor usage until the update_available_resource
-        # periodic task runs. Uncomment this once fixed.
-        # self.assert_hypervisor_usage(
-        #     source_rp_uuid, no_usage, volume_backed=False)
         self.assert_hypervisor_usage(
-            source_rp_uuid, self.flavor1, volume_backed=False)
+            source_rp_uuid, no_usage, volume_backed=False)
         # And resource usage for flavor2 should still be on the target host.
         self.assert_hypervisor_usage(
             dest_rp_uuid, self.flavor2, volume_backed=False)

nova/tests/unit/compute/test_compute_mgr.py

@@ -7261,7 +7261,15 @@ def test_confirm_resize_deletes_allocations(self):
         def do_confirm_resize(mock_save, mock_drop, mock_delete,
                               mock_confirm, mock_nwapi, mock_notify,
                               mock_mig_save, mock_mig_get, mock_inst_get):
-            self._mock_rt()
+
+            def fake_drop_move_claim(*args, **kwargs):
+                # RT.drop_move_claim must be called before
+                # instance.drop_migration_context.
+                mock_drop.assert_not_called()
+
+            mock_rt = self._mock_rt()
+            # Enforce order of drop_move_claim/drop_migration_context calls.
+            mock_rt.drop_move_claim.side_effect = fake_drop_move_claim
             self.instance.migration_context = objects.MigrationContext(
                 new_pci_devices=None,
                 old_pci_devices=None)

nova/tests/unit/compute/test_resource_tracker.py

@@ -2490,23 +2490,37 @@ def test_drop_move_claim_on_revert(self):
 
         instance = _INSTANCE_FIXTURES[0].obj_clone()
         instance.task_state = task_states.RESIZE_MIGRATING
-        instance.flavor = _INSTANCE_TYPE_OBJ_FIXTURES[2]
+        instance.new_flavor = _INSTANCE_TYPE_OBJ_FIXTURES[2]
         instance.migration_context = objects.MigrationContext()
         instance.migration_context.new_pci_devices = objects.PciDeviceList(
             objects=pci_devs)
 
-        self.rt.tracked_instances = set([instance.uuid])
+        # When reverting a resize and dropping the move claim, the
+        # destination compute calls drop_move_claim to drop the new_flavor
+        # usage and the instance should be in tracked_migrations from when
+        # the resize_claim was made on the dest during prep_resize.
+        self.rt.tracked_migrations = {
+            instance.uuid: objects.Migration(migration_type='resize')}
 
         # not using mock.sentinel.ctx because drop_move_claim calls elevated
         ctx = mock.MagicMock()
 
         with test.nested(
-                mock.patch.object(self.rt, '_update'),
-                mock.patch.object(self.rt.pci_tracker, 'free_device')
-                ) as (update_mock, mock_pci_free_device):
+            mock.patch.object(self.rt, '_update'),
+            mock.patch.object(self.rt.pci_tracker, 'free_device'),
+            mock.patch.object(self.rt, '_get_usage_dict'),
+            mock.patch.object(self.rt, '_update_usage')
+        ) as (
+            update_mock, mock_pci_free_device, mock_get_usage,
+            mock_update_usage,
+        ):
             self.rt.drop_move_claim(ctx, instance, _NODENAME)
             mock_pci_free_device.assert_called_once_with(
                 pci_dev, mock.ANY)
+            mock_get_usage.assert_called_once_with(
+                instance.new_flavor, instance, numa_topology=None)
+            mock_update_usage.assert_called_once_with(
+                mock_get_usage.return_value, _NODENAME, sign=-1)
 
     @mock.patch('nova.compute.utils.is_volume_backed_instance',
                 return_value=False)