openstack/nova
Code Issues Proposed changes

Merge "Fix timeout in EC2 CloudController.create_image()"

Browse Source
This commit is contained in:
Jenkins
2012-04-28 11:54:50 +00:00
committed by Gerrit Code Review
parent f8343bb3c2 f2d0d29269
commit 33ab99a1af
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nova/api/ec2/cloud.py
View File

@@ -1601,7 +1601,7 @@ class CloudController(object):
# NOTE(yamahata): timeout and error. 1 hour for now for safety. # NOTE(yamahata): timeout and error. 1 hour for now for safety.
# Is it too short/long? # Is it too short/long?
# Or is there any better way? # Or is there any better way?
timeout = 1 * 60 * 60 * 60 timeout = 1 * 60 * 60
if time.time() > start_time + timeout: if time.time() > start_time + timeout:
raise exception.EC2APIError( raise exception.EC2APIError(
_('Couldn\'t stop instance with in %d sec') % timeout) _('Couldn\'t stop instance with in %d sec') % timeout)