summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2014-08-21 21:46:57 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-08-23 09:31:42 +0100
commitc501492132d47aef13414b5851e7eb56fda607cd (patch)
tree2e14a1e4a2b80cb5922fcc0398a2486d4c9ed3b5 /bitbake
parenta4f077b1fe28994b3180a49a969a6d044b5114e1 (diff)
downloadpoky-c501492132d47aef13414b5851e7eb56fda607cd.tar.gz
bitbake: bitbake-worker: Improve sigterm handler
When processes terminate, we really want all of the child processes to terminate too. This was not happening for worker processes which spawned their own multiprocessing pools, leading to build hangs. This change ensures any sigterm gets passed to the whole process group. In local tests, this resolved some hanging process workloads I could generate. It does rely on signals being delivered in a timely fashion and there is a multiprocessing bug we have to work around there. (Bitbake rev: 96f8ea07ace1379380fab2d78eb592fa40c867d4) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rwxr-xr-xbitbake/bin/bitbake-worker7
1 files changed, 6 insertions, 1 deletions
diff --git a/bitbake/bin/bitbake-worker b/bitbake/bin/bitbake-worker
index 05e0cf6313..d1ff5b36c5 100755
--- a/bitbake/bin/bitbake-worker
+++ b/bitbake/bin/bitbake-worker
@@ -81,6 +81,11 @@ def workerlog_write(msg):
81 lf.write(msg) 81 lf.write(msg)
82 lf.flush() 82 lf.flush()
83 83
84def sigterm_handler(signum, frame):
85 signal.signal(signal.SIGTERM, signal.SIG_DFL)
86 os.killpg(0, signal.SIGTERM)
87 sys.exit()
88
84def fork_off_task(cfg, data, workerdata, fn, task, taskname, appends, taskdepdata, quieterrors=False): 89def fork_off_task(cfg, data, workerdata, fn, task, taskname, appends, taskdepdata, quieterrors=False):
85 # We need to setup the environment BEFORE the fork, since 90 # We need to setup the environment BEFORE the fork, since
86 # a fork() or exec*() activates PSEUDO... 91 # a fork() or exec*() activates PSEUDO...
@@ -132,7 +137,7 @@ def fork_off_task(cfg, data, workerdata, fn, task, taskname, appends, taskdepdat
132 global worker_pipe 137 global worker_pipe
133 pipein.close() 138 pipein.close()
134 139
135 signal.signal(signal.SIGTERM, signal.SIG_DFL) 140 signal.signal(signal.SIGTERM, sigterm_handler)
136 141
137 # Save out the PID so that the event can include it the 142 # Save out the PID so that the event can include it the
138 # events 143 # events