summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2014-03-09 10:05:54 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-03-10 11:10:00 -0700
commit0b4ae1c7742cec14395a0d845e1ed42b88b0e215 (patch)
tree3f48fdc3b9832adf418eca3d1e82802feee8bd76
parent6f3a537dda7ea84379fc11c1ec42cfdfeaf68bd4 (diff)
downloadast2050-yocto-poky-0b4ae1c7742cec14395a0d845e1ed42b88b0e215.zip
ast2050-yocto-poky-0b4ae1c7742cec14395a0d845e1ed42b88b0e215.tar.gz
bitbake: cooker: Handle SIGTERM more gracefully
If the cooker receives a SIGTERM it currently hangs using 100% CPU, This patch adds in an intercept for the event and puts the cooker into shutdown mode allowing it to exit cleanly/safely and avoiding the hang. (Bitbake rev: 00c22434123739b0819b31d7b1d353901a3e12da) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/bb/cooker.py7
1 files changed, 7 insertions, 0 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index 8d63195..9cb74d1 100644
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
@@ -37,6 +37,7 @@ from collections import defaultdict
import bb, bb.exceptions, bb.command
from bb import utils, data, parse, event, cache, providers, taskdata, runqueue
import Queue
+import signal
import prserv.serv
logger = logging.getLogger("BitBake")
@@ -149,6 +150,12 @@ class BBCooker:
self.parser = None
+ signal.signal(signal.SIGTERM, self.sigterm_exception)
+
+ def sigterm_exception(self, signum, stackframe):
+ bb.warn("Cooker recieved SIGTERM, shutting down...")
+ self.state = state.forceshutdown
+
def setFeatures(self, features):
original_featureset = list(self.featureset)
for feature in features:
OpenPOWER on IntegriCloud