From c5ca140d3813dcac6606090fde7298bf275b0c5d Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 29 Nov 2018 12:10:28 +0000 Subject: bitbake: 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. (Bitbake rev: 5ba83ee25c1c9cba349edb68a22476b1d5fca6ce) Signed-off-by: Richard Purdie --- bitbake/lib/bb/runqueue.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'bitbake') diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py index 9ce06c4085..4d5d876797 100644 --- a/bitbake/lib/bb/runqueue.py +++ b/bitbake/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: -- cgit v1.2.3-54-g00ecf