From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Sun, 9 Mar 2014 17:05:54 +0000 (-0700)
Subject: cooker: Handle SIGTERM more gracefully
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=00c22434123739b0819b31d7b1d353901a3e12da;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

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.

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

diff --git a/lib/bb/cooker.py b/lib/bb/cooker.py
index 8d63195189a..9cb74d1818b 100644
--- a/lib/bb/cooker.py
+++ b/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: