x/omni
Code Issues Proposed changes

Merge "[GCE] Delete instance on GCE fails with timeout"

Browse Source
This commit is contained in:
Jenkins 2017-08-11 05:47:52 +00:00 committed by Gerrit Code Review
commit 84f7272b2b
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nova/tests/unit/virt/gce/test_gce.py
View File

@ -137,7 +137,9 @@ class GCENovaTestCase(test.TestCase):
network_info=[])
mock_wait.assert_called_once_with(self._driver.gce_svc,
self._driver.gce_project,
gce_mock.fake_operation())
gce_mock.fake_operation(),
interval=5,
timeout=300)
@mock.patch('nova.virt.gce.driver.gceutils.wait_for_operation')
@mock.patch('nova.virt.gce.driver.gceutils.attach_disk')

3
nova/virt/gce/driver.py
View File

@ -598,7 +598,8 @@ class GCEDriver(driver.ComputeDriver):
LOG.error("Instance {0} not found in GCE, removing from openstack."
.format(instance.uuid))
return
gceutils.wait_for_operation(compute, project, operation)
gceutils.wait_for_operation(compute, project, operation,
interval=5, timeout=300)
LOG.info("Destroy Complete %s" % instance.uuid)
def attach_volume(self, context, connection_info, instance, mountpoint,