Merge "catch NotFound errors when consuming or abandoning"

This commit is contained in:
Jenkins
2015-02-15 05:25:13 +00:00
committed by Gerrit Code Review

View File

@@ -148,7 +148,7 @@ class SingleThreadedConductor(base.Conductor):
self._jobboard.consume(job, self._name) self._jobboard.consume(job, self._name)
else: else:
self._jobboard.abandon(job, self._name) self._jobboard.abandon(job, self._name)
except excp.JobFailure: except (excp.JobFailure, excp.NotFound):
if consume: if consume:
LOG.warn("Failed job consumption: %s", job, LOG.warn("Failed job consumption: %s", job,
exc_info=True) exc_info=True)