diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 0f7b4acefa94..aae22c413d0e 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -4142,7 +4142,7 @@ class ComputeManager(manager.Manager): # FIXME(danms): Remove this in Rocky rt = self._get_resource_tracker() rt.delete_allocation_for_failed_resize( - instance, node, instance_type) + context, instance, node, instance_type) # try to re-schedule the resize elsewhere: exc_info = sys.exc_info() self._reschedule_resize_or_reraise(context, image, instance, diff --git a/nova/tests/functional/regressions/test_bug_1741125.py b/nova/tests/functional/regressions/test_bug_1741125.py index 2d361e20bd21..7981892ea7c5 100644 --- a/nova/tests/functional/regressions/test_bug_1741125.py +++ b/nova/tests/functional/regressions/test_bug_1741125.py @@ -78,3 +78,12 @@ class TestServerResizeReschedule(ProviderUsageBaseTestCase): 'VERIFY_RESIZE') self.assertEqual(self.flavor2['name'], server['flavor']['original_name']) + + +class TestServerResizeRescheduleWithCachingScheduler( + TestServerResizeReschedule): + """Tests the reschedule scenario using the CachingScheduler.""" + + def setUp(self): + self.flags(driver='caching_scheduler', group='scheduler') + super(TestServerResizeRescheduleWithCachingScheduler, self).setUp()