[oe-commits] [bitbake] 01/10: WIP bitbake-worker/cooker: more logging to aid debugging
git at git.openembedded.org
git at git.openembedded.org
Wed Nov 16 11:42:35 UTC 2016
rpurdie pushed a commit to branch master-next
in repository bitbake.
commit a2156f7976e2fdafb3389fdff21250317d249bb7
Author: Ross Burton <ross.burton at intel.com>
AuthorDate: Fri Sep 16 12:42:56 2016 +0100
WIP bitbake-worker/cooker: more logging to aid debugging
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
bin/bitbake-worker | 14 ++++++++++----
lib/bb/cooker.py | 2 ++
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/bin/bitbake-worker b/bin/bitbake-worker
index af66ff0..c2722a7 100755
--- a/bin/bitbake-worker
+++ b/bin/bitbake-worker
@@ -322,9 +322,11 @@ class BitbakeWorker(object):
def sigterm_exception(self, signum, stackframe):
if signum == signal.SIGTERM:
- bb.warn("Worker received SIGTERM, shutting down...")
+ logger.warning("Worker received SIGTERM, shutting down...")
elif signum == signal.SIGHUP:
- bb.warn("Worker received SIGHUP, shutting down...")
+ logger.warning("Worker received SIGHUP, shutting down...")
+ else:
+ logger.warning("Worker received unexpected signal %d, shutting down..." % signum)
self.handle_finishnow(None)
signal.signal(signal.SIGTERM, signal.SIG_DFL)
os.kill(os.getpid(), signal.SIGTERM)
@@ -337,6 +339,7 @@ class BitbakeWorker(object):
r = self.input.read()
if len(r) == 0:
# EOF on pipe, server must have terminated
+ logger.warning("EOF on pipe, server terminated?")
self.sigterm_exception(signal.SIGTERM, None)
self.queue = self.queue + r
except (OSError, IOError):
@@ -345,7 +348,7 @@ class BitbakeWorker(object):
self.handle_item(b"cookerconfig", self.handle_cookercfg)
self.handle_item(b"workerdata", self.handle_workerdata)
self.handle_item(b"runtask", self.handle_runtask)
- self.handle_item(b"finishnow", self.handle_finishnow)
+ self.handle_item(b"finishnow", self.handle_finishnow2)
self.handle_item(b"ping", self.handle_ping)
self.handle_item(b"quit", self.handle_quit)
@@ -429,6 +432,10 @@ class BitbakeWorker(object):
worker_fire_prepickled(b"<exitcode>" + pickle.dumps((task, status)) + b"</exitcode>")
+ def handle_finishnow2(self, _):
+ logger.warning("Received finishnow instruction")
+ self.handle_finishnow(_)
+
def handle_finishnow(self, _):
if self.build_pids:
logger.info("Sending SIGTERM to remaining %s tasks", len(self.build_pids))
@@ -462,4 +469,3 @@ while len(worker_queue):
worker_flush()
workerlog_write("exitting")
sys.exit(0)
-
diff --git a/lib/bb/cooker.py b/lib/bb/cooker.py
index c08af45..f0945fc 100644
--- a/lib/bb/cooker.py
+++ b/lib/bb/cooker.py
@@ -1418,10 +1418,12 @@ class BBCooker:
msg = None
interrupted = 0
if abort or self.state == state.forceshutdown:
+ bb.warn("builtTarg forceshutdown state")
rq.finish_runqueue(True)
msg = "Forced shutdown"
interrupted = 2
elif self.state == state.shutdown:
+ bb.warn("builtTarg shutdown state")
rq.finish_runqueue(False)
msg = "Stopped build"
interrupted = 1
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Openembedded-commits
mailing list