summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2022-08-05 11:22:56 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-08-07 13:30:31 +0100
commitcf7f60b83adaded180f6717cb4681edc1d65b66d (patch)
tree183c3d51610355583d83c160e5a05f9770ada3ee
parent27228c7f026acb8ae9e1211d0486ffb7338123a2 (diff)
downloadbitbake-cf7f60b83adaded180f6717cb4681edc1d65b66d.tar.gz
runqueue: Improve deadlock warning messages
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>
-rw-r--r--lib/bb/runqueue.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/bb/runqueue.py b/lib/bb/runqueue.py
index 873f384ec..8ecf166c0 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: