Merge "Fix TypeError in prep_resize allocation cleanup" into stable/queens
This commit is contained in:
commit
56518449c7
|
@ -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,
|
||||
|
|
|
@ -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()
|
||||
|
|
Loading…
Reference in New Issue