diff options
| author | Tiago Gomes <tiago.gomes@codethink.co.uk> | 2018-09-11 16:00:39 +0100 |
|---|---|---|
| committer | Tiago Gomes <tiago.gomes@codethink.co.uk> | 2018-09-14 16:38:43 +0100 |
| commit | 2fa927163cdbfb23832357017ae83740cfcd8cd5 (patch) | |
| tree | f8ef0f8e18e1ab9380a188dec259f6ee1827595c | |
| parent | 46cbd8896b24443aac1a616bbd62892ebe31a7c2 (diff) | |
| download | buildstream-2fa927163cdbfb23832357017ae83740cfcd8cd5.tar.gz | |
scheduler: minor cleanups to CleanupJob
Remove unneeded cruft.
| -rw-r--r-- | buildstream/_scheduler/jobs/cleanupjob.py | 9 | ||||
| -rw-r--r-- | buildstream/_scheduler/scheduler.py | 3 |
2 files changed, 2 insertions, 10 deletions
diff --git a/buildstream/_scheduler/jobs/cleanupjob.py b/buildstream/_scheduler/jobs/cleanupjob.py index c22ce3b98..399435ad9 100644 --- a/buildstream/_scheduler/jobs/cleanupjob.py +++ b/buildstream/_scheduler/jobs/cleanupjob.py @@ -21,9 +21,8 @@ from ..._platform import Platform class CleanupJob(Job): - def __init__(self, *args, complete_cb, **kwargs): + def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) - self._complete_cb = complete_cb platform = Platform.get_platform() self._artifacts = platform.artifactcache @@ -34,9 +33,3 @@ class CleanupJob(Job): def parent_complete(self, success, result): if success: self._artifacts.set_cache_size(result) - - if self._complete_cb: - self._complete_cb() - - def child_process_data(self): - return {} diff --git a/buildstream/_scheduler/scheduler.py b/buildstream/_scheduler/scheduler.py index de544bce7..8faf58e65 100644 --- a/buildstream/_scheduler/scheduler.py +++ b/buildstream/_scheduler/scheduler.py @@ -357,8 +357,7 @@ class Scheduler(): job = CleanupJob(self, 'cleanup', 'cleanup/cleanup', resources=[ResourceType.CACHE, ResourceType.PROCESS], - exclusive_resources=[ResourceType.CACHE], - complete_cb=None) + exclusive_resources=[ResourceType.CACHE]) self.schedule_jobs([job]) # _suspend_jobs() |