diff mbox series

[2/3] runqueue: Improve deadlock warning messages

Message ID 20220805103232.3674163-2-richard.purdie@linuxfoundation.org
State Accepted, archived
Commit cf7f60b83adaded180f6717cb4681edc1d65b66d
Headers show
Series [1/3] runqueue: Ensure deferred tasks are sorted by multiconfig | expand

Commit Message

Richard Purdie Aug. 5, 2022, 10:32 a.m. UTC 
Tweak the deadlock breaking messages to be explict about which task is
blocked on which other task. The messages currently imply it is "freeing"
the blocking task which is confusing.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 lib/bb/runqueue.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
diff mbox series

Patch

diff --git a/lib/bb/runqueue.py b/lib/bb/runqueue.py
index 4d4ac3b991..e06246f741 100644
--- a/lib/bb/runqueue.py
+++ b/lib/bb/runqueue.py
@@ -2237,10 +2237,12 @@  class RunQueueExecute:
 
         # No more tasks can be run. If we have deferred setscene tasks we should run them.
         if self.sq_deferred:
-            tid = self.sq_deferred.pop(list(self.sq_deferred.keys())[0])
-            logger.warning("Runqeueue deadlocked on deferred tasks, forcing task %s" % tid)
-            if tid not in self.runq_complete:
-                self.sq_task_failoutright(tid)
+            deferred_tid = list(self.sq_deferred.keys())[0]
+            blocking_tid = self.sq_deferred.pop(deferred_tid)
+            logger.warning("Runqeueue deadlocked on deferred tasks, forcing task %s blocked by %s" % (deferred_tid, blocking_tid))
+            if blocking_tid not in self.runq_complete:
+                logger.warning("Failing blocking task %s" % (blocking_tid))
+                self.sq_task_failoutright(blocking_tid)
             return True
 
         if self.failed_tids: