x/omni
Code Issues Proposed changes

[GCE] Delete instance on GCE fails with timeout

Browse Source 
GCE instance delete operation fails sometimes as it may take
more than 60 sec. Default timeout for wait_for_operation is 60 sec,
which is not sufficient for instance delete operation.

Change-Id: I06f8172a2f87ea5f7972b7624265a3fd0ad576e4
Closes-bug: #1709891
This commit is contained in:
Sanket 2017-08-10 21:03:48 +05:30
parent 57727d3e19
commit 66620a1d4b
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=[]) network_info=[])
mock_wait.assert_called_once_with(self._driver.gce_svc, mock_wait.assert_called_once_with(self._driver.gce_svc,
self._driver.gce_project, 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.wait_for_operation')
@mock.patch('nova.virt.gce.driver.gceutils.attach_disk') @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." LOG.error("Instance {0} not found in GCE, removing from openstack."
.format(instance.uuid)) .format(instance.uuid))
return 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) LOG.info("Destroy Complete %s" % instance.uuid)
def attach_volume(self, context, connection_info, instance, mountpoint, def attach_volume(self, context, connection_info, instance, mountpoint,