[bitbake-devel] runqueue.py: Gracefully exit if an exception occurs in the runqueue execution code

Submitted by Richard Purdie on July 25, 2012, 7:16 p.m. | Patch ID: 33065


Message ID 1343243793.27838.15.camel@ted
State New
Headers show

Commit Message

Richard Purdie July 25, 2012, 7:16 p.m.
There was a bug where an exception in the runqueue code would cause an infinite loop
of debug messages. The exception would get reported but would loop since runqueue was
still registered as an idle handler.

This patch adds an exception handler to ensure in the case of errors, the system
more gracefully shuts down and doesn't loop.

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

Patch hide | download patch | download mbox

diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py
index 306ae79..2925741 100644
--- a/bitbake/lib/bb/runqueue.py
+++ b/bitbake/lib/bb/runqueue.py
@@ -862,7 +862,7 @@  class RunQueue:
             cache[task] = iscurrent
         return iscurrent
-    def execute_runqueue(self):
+    def _execute_runqueue(self):
         Run the tasks in a queue prepared by rqdata.prepare()
         Upon failure, optionally try to recover the build using any alternate providers
@@ -926,6 +926,14 @@  class RunQueue:
         # Loop
         return retval
+    def execute_runqueue(self):
+        try:
+            return self._execute_runqueue()
+        except:
+            logger.error("An uncaught exception occured in runqueue, please see the failure below:")
+            self.state = runQueueComplete
+            raise
     def finish_runqueue(self, now = False):
         if not self.rqexe: