diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-08-05 11:25:19 +0100 |
|---|---|---|
| committer |   Steve Sakoman <steve@sakoman.com> | 2022-09-28 06:47:55 -1000 |
| commit | f386298fc056ef130c2eb6dabf25eafbd55f55ca (patch) | |
| tree | 3e6ffaa4bf9c4a17689b6fd1930c7b9b3b206834 | |
| parent | d1b84e3cfe9fb8d282d4b700a9fe31891e00d837 (diff) | |
| download | bitbake-f386298fc056ef130c2eb6dabf25eafbd55f55ca.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>
(cherry picked from commit 8efced47fcb47851a370fd6786df6fb377f99963)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
| -rw-r--r-- | lib/bb/runqueue.py | 3 |
1 files changed, 0 insertions, 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: |