x/python-ganttclient
Code Issues Proposed changes

typo trying to raise InstanceNotFound when all zones returned nothing

Browse Source
This commit is contained in:
Chris Behrens
2011-09-07 23:39:39 -07:00
parent aaa9121200
commit cd2ac5ff08
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
nova/scheduler/api.py
View File

@@ -168,9 +168,10 @@ def child_zone_helper(zone_list, func):
url = zone.api_url url = zone.api_url
LOG.warn(_("Failed request to zone; URL=%(url)s: %(e)s") LOG.warn(_("Failed request to zone; URL=%(url)s: %(e)s")
% locals()) % locals())
# This is being returned instead of raised, so that when results are # This is being returned instead of raised, so that when
# processed in unmarshal_result() after the greenpool.imap completes, # results are # processed in unmarshal_result() after the
# the exception can be raised there if no other zones had a response. # greenpool.imap completes, # the exception can be raised
# there if no other zones had a response.
return exception.ZoneRequestError() return exception.ZoneRequestError()
else: else:
return func(nova, zone) return func(nova, zone)
@@ -372,7 +373,7 @@ class reroute_compute(object):
return reduced_response[0] # first for now. return reduced_response[0] # first for now.
elif found_exception: elif found_exception:
raise found_exception raise found_exception
exception.InstanceNotFound(instance_id=self.item_uuid) raise exception.InstanceNotFound(instance_id=self.item_uuid)
def redirect_handler(f): def redirect_handler(f):