opendev
/
puppet-subunit2sql
Code Issues Proposed changes

Ensure all jobs send a completion packet 

In the job handler, aborted jobs would never send a work_complete
packet, which would cause the gearman server to track them
indefinitely.  Update the handler so that all jobs send either
a work_complete or work_exception.

Change-Id: Ia3b914762d46b1873888d5025e4ba86f9d042895
This commit is contained in:
James E. Blair 2016-04-08 15:55:56 -07:00
parent d31b5d9710
commit b8b253cfaf
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
files/subunit-gearman-worker.py
View File

@ -121,8 +121,7 @@ class SubunitRetriever(threading.Thread):
# discarded by zuul.
subunit_io = self._retrieve_subunit_v2(source_url, retry)
if not subunit_io:
job.sendWorkException(
'Unable to retrieve subunit stream'.encode('utf8'))
raise Exception('Unable to retrieve subunit stream')
else:
if subunit_io.closed:
logging.debug("Pushing closed subunit file: %s" %
@ -132,7 +131,7 @@ class SubunitRetriever(threading.Thread):
out_event = fields.copy()
out_event["subunit"] = subunit_io
self._write_to_db(out_event)
job.sendWorkComplete()
job.sendWorkComplete()
except Exception as e:
logging.exception("Exception handling log event.")
job.sendWorkException(str(e).encode('utf-8'))