From 68aefbb27de84ef2e59c75be5dc79fe393a563d3 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 9 Sep 2015 22:44:37 +0100 Subject: bitbake: bitbake-worker: Ensure pipe closure doesn't crash before killpg() If the pipe is closed, we want to ensure that we kill any child processes by triggering the sigterm handler before we exit. This code does that, hopefully avoiding the remaining process left behind issues on the autobuilder. (Bitbake rev: 60f6c2818f38c4d9c2d9aaa42acf3071636f4a3b) Signed-off-by: Richard Purdie --- bitbake/bin/bitbake-worker | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/bitbake/bin/bitbake-worker b/bitbake/bin/bitbake-worker index 5f6543b7e9..af17b874aa 100755 --- a/bitbake/bin/bitbake-worker +++ b/bitbake/bin/bitbake-worker @@ -87,7 +87,11 @@ def worker_child_fire(event, d): global worker_pipe data = "" + pickle.dumps(event) + "" - worker_pipe.write(data) + try: + worker_pipe.write(data) + except IOError: + sigterm_handler(None, None) + raise bb.event.worker_fire = worker_fire -- cgit v1.2.3-54-g00ecf