openstack/nova
Code Issues Proposed changes

Revert graceful shutdown patch

Browse Source 
aka: "Stop, Rescue, and Delete should give guest a chance to shutdown"

This reverts commit b32d01d44c.

Unfortunately this patch had an unintended side effect that we didn't
notice until after it was merged.  It adds about 25 minutes to tempest
runs, which isn't really acceptable in the gate.  We need to revert this
until we can sort that out.

Change-Id: Ibdd5c86e60b5ede4ec1a38d9efa7c94d60de1720
This commit is contained in:
Russell Bryant
2013-12-16 11:48:30 -05:00
parent b32d01d44c
commit 6dae86b57d
26 changed files with 282 additions and 702 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
nova/tests/compute/test_shelve.py
View File

@@ -57,7 +57,7 @@ class ShelveComputeManagerTestCase(test_compute.BaseTestCase):
self.compute._notify_about_instance_usage(self.context, instance,
'shelve.start')
self.compute.driver.power_off(instance, True)
self.compute.driver.power_off(instance)
self.compute._get_power_state(self.context,
instance).AndReturn(123)
self.compute.driver.snapshot(self.context, instance, 'fake_image_id',
@@ -81,7 +81,7 @@ class ShelveComputeManagerTestCase(test_compute.BaseTestCase):
if CONF.shelved_offload_time == 0:
self.compute._notify_about_instance_usage(self.context, instance,
'shelve_offload.start')
self.compute.driver.power_off(instance, False)
self.compute.driver.power_off(instance)
self.compute._get_power_state(self.context,
instance).AndReturn(123)
db.instance_update_and_get_original(self.context,
@@ -132,7 +132,7 @@ class ShelveComputeManagerTestCase(test_compute.BaseTestCase):
self.compute._notify_about_instance_usage(self.context, instance,
'shelve_offload.start')
self.compute.driver.power_off(instance, True)
self.compute.driver.power_off(instance)
self.compute._get_power_state(self.context,
instance).AndReturn(123)
db.instance_update_and_get_original(self.context, instance['uuid'],