diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-09-16 07:19:34 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-09-16 22:17:07 +0100 |
| commit | 72f51767da47af12d2c56bd3ee87cb0018b16705 (patch) | |
| tree | f822d0e697a97a1553a3fea3a8631d6974978ea6 | |
| parent | c7b506d11df78cfc4610db6578745eaa6220b13a (diff) | |
| download | bitbake-72f51767da47af12d2c56bd3ee87cb0018b16705.tar.gz | |
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.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 51bdd6cb3bd9e2c02e261fb578bb945b86b82c75)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | lib/bb/runqueue.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/bb/runqueue.py b/lib/bb/runqueue.py index 6c41fe6d4..014ee37bf 100644 --- a/lib/bb/runqueue.py +++ b/lib/bb/runqueue.py @@ -2180,7 +2180,8 @@ class RunQueueExecute: if self.sq_deferred: tid = self.sq_deferred.pop(list(self.sq_deferred.keys())[0]) logger.warning("Runqeueue deadlocked on deferred tasks, forcing task %s" % tid) - self.sq_task_failoutright(tid) + if tid not in self.runq_complete: + self.sq_task_failoutright(tid) return True if len(self.failed_tids) != 0: |