diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-11-29 12:10:28 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-12-06 10:24:49 +0000 |
| commit | 7e76237c930d354ee7eb37d247d71b4f4fbf7993 (patch) | |
| tree | f60ea2599df25a8457f510b9d23f368df7b23fe3 | |
| parent | c36803dba4fce8e6b16e437d702116a918ff718b (diff) | |
| download | bitbake-contrib-7e76237c930d354ee7eb37d247d71b4f4fbf7993.tar.gz | |
runqueue: Ensure disk monitor is started when no setscene tasks are run
Currently if there are no setscene tasks, the disk monitor isn't started.
Move the startup code to somewhere to ensure it always is started. This
issue would partially explain occasional selftest failures.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | lib/bb/runqueue.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/lib/bb/runqueue.py b/lib/bb/runqueue.py index 9ce06c408..4d5d87679 100644 --- a/lib/bb/runqueue.py +++ b/lib/bb/runqueue.py @@ -1409,6 +1409,12 @@ class RunQueue: bb.event.fire(bb.event.DepTreeGenerated(depgraph), self.cooker.data) if self.state is runQueueSceneInit: + if not self.dm_event_handler_registered: + res = bb.event.register(self.dm_event_handler_name, + lambda x: self.dm.check(self) if self.state in [runQueueSceneRun, runQueueRunning, runQueueCleanUp] else False, + ('bb.event.HeartbeatEvent',)) + self.dm_event_handler_registered = True + dump = self.cooker.configuration.dump_signatures if dump: self.rqdata.init_progress_reporter.finish() @@ -1425,11 +1431,6 @@ class RunQueue: self.rqexe = RunQueueExecuteScenequeue(self) if self.state is runQueueSceneRun: - if not self.dm_event_handler_registered: - res = bb.event.register(self.dm_event_handler_name, - lambda x: self.dm.check(self) if self.state in [runQueueSceneRun, runQueueRunning, runQueueCleanUp] else False, - ('bb.event.HeartbeatEvent',)) - self.dm_event_handler_registered = True retval = self.rqexe.execute() if self.state is runQueueRunInit: |