openstack/swift
Code Issues Proposed changes

Merge "handle exception correctly in _make_app_iter_reader"

Browse Source
This commit is contained in:
Jenkins 2012-08-17 23:54:32 +00:00 committed by Gerrit Code Review
commit 73b00ca9de
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
swift/proxy/server.py
View File

@ -673,6 +673,7 @@ class Controller(object):
logging information. logging information.
""" """
self.app.logger.thread_locals = logger_thread_locals self.app.logger.thread_locals = logger_thread_locals
success = True
try: try:
try: try:
while True: while True:
@ -686,13 +687,15 @@ class Controller(object):
_('Client did not read from queue within %ss') % _('Client did not read from queue within %ss') %
self.app.client_timeout) self.app.client_timeout)
self.app.logger.increment('client_timeouts') self.app.logger.increment('client_timeouts')
success = False
except (Exception, Timeout): except (Exception, Timeout):
self.exception_occurred(node, _('Object'), self.exception_occurred(node, _('Object'),
_('Trying to read during GET')) _('Trying to read during GET'))
success = False
finally: finally:
# Ensure the queue getter gets an empty-string-terminator. # Ensure the queue getter gets a terminator.
queue.resize(2) queue.resize(2)
queue.put('') queue.put(success)
# Close-out the connection as best as possible. # Close-out the connection as best as possible.
if getattr(source, 'swift_conn', None): if getattr(source, 'swift_conn', None):
try: try:
@ -733,7 +736,11 @@ class Controller(object):
source = node = None source = node = None
while True: while True:
chunk = queue.get(timeout=self.app.node_timeout) chunk = queue.get(timeout=self.app.node_timeout)
if not chunk: if isinstance(chunk, bool): # terminator
success = chunk
if not success:
raise Exception(_('Failed to read all data'
' from the source'))
break break
yield chunk yield chunk
except Empty: except Empty: