diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-09-07 12:14:29 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-09-08 15:33:14 +0100 |
commit | 7e599a1feb4fe94f25840b24a21e8db0e751e3e3 (patch) | |
tree | e00a7bcbe649d8bb90c3eb1e04c479bb26447271 /bitbake | |
parent | 745bc895745c58a99edb85da9081e71e3e29b9a4 (diff) | |
download | poky-7e599a1feb4fe94f25840b24a21e8db0e751e3e3.tar.gz |
bitbake: runqueue: Avoid deadlock avoidance task graph corruption
If the deferred task deadlock avoidance code triggers, it could mark an executed
task as failed which leads to "covered and not covered" error messages. Improve
the logic so if the deadlock code is triggered, it doesn't cause the errors.
(Bitbake rev: 51bdd6cb3bd9e2c02e261fb578bb945b86b82c75)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rw-r--r-- | bitbake/lib/bb/runqueue.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py index 25e012125c..f5f25c5b7d 100644 --- a/bitbake/lib/bb/runqueue.py +++ b/bitbake/lib/bb/runqueue.py | |||
@@ -2180,7 +2180,8 @@ class RunQueueExecute: | |||
2180 | if self.sq_deferred: | 2180 | if self.sq_deferred: |
2181 | tid = self.sq_deferred.pop(list(self.sq_deferred.keys())[0]) | 2181 | tid = self.sq_deferred.pop(list(self.sq_deferred.keys())[0]) |
2182 | logger.warning("Runqeueue deadlocked on deferred tasks, forcing task %s" % tid) | 2182 | logger.warning("Runqeueue deadlocked on deferred tasks, forcing task %s" % tid) |
2183 | self.sq_task_failoutright(tid) | 2183 | if tid not in self.runq_complete: |
2184 | self.sq_task_failoutright(tid) | ||
2184 | return True | 2185 | return True |
2185 | 2186 | ||
2186 | if len(self.failed_tids) != 0: | 2187 | if len(self.failed_tids) != 0: |