diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-08-05 11:25:19 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-08-08 15:44:47 +0100 |
commit | c58fca98e4959684c5d3f3ac93570ff06898df58 (patch) | |
tree | f45971c11c3957e1fabb63f19ba5b4009204e8df /bitbake/lib/bb/runqueue.py | |
parent | 645aa39512491d17f8fd4239264eabbfcb651b10 (diff) | |
download | poky-c58fca98e4959684c5d3f3ac93570ff06898df58.tar.gz |
bitbake: 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.
(Bitbake rev: 8efced47fcb47851a370fd6786df6fb377f99963)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/runqueue.py')
-rw-r--r-- | bitbake/lib/bb/runqueue.py | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py index 8ecf166c00..bc1cbb360f 100644 --- a/bitbake/lib/bb/runqueue.py +++ b/bitbake/lib/bb/runqueue.py | |||
@@ -2240,9 +2240,6 @@ class RunQueueExecute: | |||
2240 | deferred_tid = list(self.sq_deferred.keys())[0] | 2240 | deferred_tid = list(self.sq_deferred.keys())[0] |
2241 | blocking_tid = self.sq_deferred.pop(deferred_tid) | 2241 | blocking_tid = self.sq_deferred.pop(deferred_tid) |
2242 | logger.warning("Runqeueue deadlocked on deferred tasks, forcing task %s blocked by %s" % (deferred_tid, blocking_tid)) | 2242 | logger.warning("Runqeueue deadlocked on deferred tasks, forcing task %s blocked by %s" % (deferred_tid, blocking_tid)) |
2243 | if blocking_tid not in self.runq_complete: | ||
2244 | logger.warning("Failing blocking task %s" % (blocking_tid)) | ||
2245 | self.sq_task_failoutright(blocking_tid) | ||
2246 | return True | 2243 | return True |
2247 | 2244 | ||
2248 | if self.failed_tids: | 2245 | if self.failed_tids: |