From f386298fc056ef130c2eb6dabf25eafbd55f55ca Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 5 Aug 2022 11:25:19 +0100 Subject: 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 (cherry picked from commit 8efced47fcb47851a370fd6786df6fb377f99963) Signed-off-by: Steve Sakoman --- lib/bb/runqueue.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/lib/bb/runqueue.py b/lib/bb/runqueue.py index 0d89740b9..48e25401b 100644 --- a/lib/bb/runqueue.py +++ b/lib/bb/runqueue.py @@ -2257,9 +2257,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: -- cgit 1.2.3-korg