[bitbake-devel] runqueue.py: Gracefully handle a missing worker process
Richard Purdie
richard.purdie at linuxfoundation.org
Sun Mar 9 17:01:19 UTC 2014
If the worker has already gone missing (e.g. SIGTERM), we should
gracefully handle the write failures at exit time rather than throwing
ugly tracebacks.
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py
index 967e944..7d3e91a 100644
--- a/bitbake/lib/bb/runqueue.py
+++ b/bitbake/lib/bb/runqueue.py
@@ -900,8 +900,11 @@ class RunQueue:
if not worker:
return
logger.debug(1, "Teardown for bitbake-worker")
- worker.stdin.write("<quit></quit>")
- worker.stdin.flush()
+ try:
+ worker.stdin.write("<quit></quit>")
+ worker.stdin.flush()
+ except IOError:
+ pass
while worker.returncode is None:
workerpipe.read()
worker.poll()
@@ -1275,11 +1278,15 @@ class RunQueueExecute:
def finish_now(self):
- self.rq.worker.stdin.write("<finishnow></finishnow>")
- self.rq.worker.stdin.flush()
- if self.rq.fakeworker:
- self.rq.fakeworker.stdin.write("<finishnow></finishnow>")
- self.rq.fakeworker.stdin.flush()
+ for worker in [self.rq.worker, self.rq.fakeworker]:
+ if not worker:
+ continue
+ try:
+ worker.stdin.write("<finishnow></finishnow>")
+ worker.stdin.flush()
+ except IOError:
+ # worker must have died?
+ pass
if len(self.failed_fnids) != 0:
self.rq.state = runQueueFailed
More information about the bitbake-devel
mailing list