Patchwork [bitbake-devel] cooker: Handle SIGTERM more gracefully

login
register
mail settings
Submitter Richard Purdie
Date March 9, 2014, 5:05 p.m.
Message ID <1394384754.7883.13.camel@ted>
Download mbox | patch
Permalink /patch/68339/
State New
Headers show

Comments

Richard Purdie - March 9, 2014, 5:05 p.m.
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.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

Patch

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: