aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2022-08-05 11:25:19 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-08-07 13:30:31 +0100
commit8efced47fcb47851a370fd6786df6fb377f99963 (patch)
tree8691fdeed82d020516e1feb80643b34eab3f4f67
parentcf7f60b83adaded180f6717cb4681edc1d65b66d (diff)
downloadbitbake-8efced47fcb47851a370fd6786df6fb377f99963.tar.gz
runqueue: Drop deadlock breaking force fail
I'm 99% certain this failing of a scenequeue task corrupts runqueue and causes all kinds of breakage. I'd rather runqueue deadlocked than corrupted and did weird things so drop this code. We've seen builds where the deadlock triggers and it then tries to run tasks where the SQ task already ran with very confusing failures. It is likely it is this code causing it. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--lib/bb/runqueue.py3
1 files changed, 0 insertions, 3 deletions
diff --git a/lib/bb/runqueue.py b/lib/bb/runqueue.py
index 8ecf166c0..bc1cbb360 100644
--- a/lib/bb/runqueue.py
+++ b/lib/bb/runqueue.py
@@ -2240,9 +2240,6 @@ class RunQueueExecute:
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: