From 393e485f4e4a76fb92a4297487bcfce5fae4cc50 Mon Sep 17 00:00:00 2001 From: Andrew Laski Date: Tue, 11 Dec 2012 13:48:11 -0500 Subject: [PATCH] Fix poll_rescued_instances periodic task The poll_rescued_instances periodic task now checks the amount of time that an instance has been in the RESCUED stated before timing out the rescue. It also now performs the unrescue through the compute api in order to make sure the database is left in a consistent state. The poll_rescued_instances method is no longer necessary in the virt driver interface and has been removed. And also removed from the different virt drivers, since it was just doing a 'pass' in each of them. bug 1088625 bug 1088627 Change-Id: I75f7dc188cc49e5f6e5c8a3cb256d1c42ff7d882 --- nova/tests/test_virt_drivers.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/nova/tests/test_virt_drivers.py b/nova/tests/test_virt_drivers.py index 83476354..563b3a44 100644 --- a/nova/tests/test_virt_drivers.py +++ b/nova/tests/test_virt_drivers.py @@ -282,10 +282,6 @@ class _VirtDriverTestCase(_FakeDriverBackendTestCase): instances = [self._get_running_instance()] self.connection.poll_rebooting_instances(10, instances) - @catch_notimplementederror - def test_poll_rescued_instances(self): - self.connection.poll_rescued_instances(10) - @catch_notimplementederror def test_migrate_disk_and_power_off(self): instance_ref, network_info = self._get_running_instance()