summaryrefslogtreecommitdiff
path: root/distbuild
diff options
context:
space:
mode:
authorRichard Ipsum <richard.ipsum@codethink.co.uk>2014-06-02 13:57:12 (GMT)
committerRichard Ipsum <richard.ipsum@codethink.co.uk>2014-06-03 17:43:26 (GMT)
commit4be03eb51c2aa10bb6482de6797ac2f4ac3c7057 (patch)
tree4fef5aa53cc3129a5200153e33bde6268ae59410 /distbuild
parent64263de0123f9e513a300fd179e5b84384fa5343 (diff)
downloadmorph-4be03eb51c2aa10bb6482de6797ac2f4ac3c7057.tar.gz
Make job fail if caching fails
This fixes the bug that causes the distbuild controller to crash when population of the artifact cache fails.
Diffstat (limited to 'distbuild')
-rw-r--r--distbuild/worker_build_scheduler.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/distbuild/worker_build_scheduler.py b/distbuild/worker_build_scheduler.py
index a7f7eb8..ee167c0 100644
--- a/distbuild/worker_build_scheduler.py
+++ b/distbuild/worker_build_scheduler.py
@@ -600,7 +600,12 @@ class WorkerConnection(distbuild.StateMachine):
logging.error(
'Failed to populate artifact cache: %s %s' %
(event.msg['status'], event.msg['body']))
+
+ self.mainloop.queue_event(WorkerConnection,
+ _ExecFailed(self._job))
+
new_event = WorkerBuildFailed(
self._exec_response_msg, self._job.artifact.cache_key)
self.mainloop.queue_event(WorkerConnection, new_event)
+
self.mainloop.queue_event(self, _BuildFailed())