summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTristan Maat <tristan.maat@codethink.co.uk>2018-07-16 11:38:29 +0100
committerTristan Maat <tristan.maat@codethink.co.uk>2018-07-16 11:58:53 +0100
commit6c304b178a1969e2a42d57ced40018cd11c8c6af (patch)
treef55a64514e9f57fbd5aebd2cb4bc5655f99e96aa
parente1dec47158a93aed3235bcbe9d33a70b1aee7b11 (diff)
downloadbuildstream-6c304b178a1969e2a42d57ced40018cd11c8c6af.tar.gz
WIP: Solve rebase fallout
-rw-r--r--buildstream/_scheduler/scheduler.py9
1 files changed, 2 insertions, 7 deletions
diff --git a/buildstream/_scheduler/scheduler.py b/buildstream/_scheduler/scheduler.py
index ee226cfb6..31619e960 100644
--- a/buildstream/_scheduler/scheduler.py
+++ b/buildstream/_scheduler/scheduler.py
@@ -312,13 +312,6 @@ class Scheduler():
self.schedule_jobs(ready)
self._sched()
-
-
- self.schedule_jobs([job])
-
-
- self.schedule_jobs([job])
-
def _run_cleanup(self, cache_size):
if cache_size and cache_size < self.context.cache_quota:
return
@@ -329,6 +322,7 @@ class Scheduler():
ResourceType.PROCESS],
exclusive_resources=[ResourceType.CACHE],
complete_cb=None)
+ self.schedule_jobs([job])
def _check_cache_size_real(self):
logpath = os.path.join(self.context.logdir, 'cache_size.{pid}.log')
@@ -337,6 +331,7 @@ class Scheduler():
ResourceType.PROCESS],
exclusive_resources=[ResourceType.CACHE],
complete_cb=self._run_cleanup)
+ self.schedule_jobs([job])
# _suspend_jobs()
#