From 7263ea8c7a8c17432350a5a9af4283e9ded1486f Mon Sep 17 00:00:00 2001 From: Josh Smith Date: Tue, 14 Aug 2018 16:44:17 +0100 Subject: job.py: Prevent terminated jobs retrying Fixes #531: Jobs were retrying when terminated, this lead to the process being spawned again and starting up fresh. --- buildstream/_scheduler/jobs/job.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buildstream/_scheduler/jobs/job.py b/buildstream/_scheduler/jobs/job.py index c339a333b..922ce5613 100644 --- a/buildstream/_scheduler/jobs/job.py +++ b/buildstream/_scheduler/jobs/job.py @@ -250,7 +250,7 @@ class Job(): # def resume(self, silent=False): if self._suspended: - if not silent: + if not silent and not self._scheduler.terminated: self.message(MessageType.STATUS, "{} resuming".format(self.action_name)) @@ -549,7 +549,7 @@ class Job(): # self._retry_flag = returncode not in (RC_OK, RC_PERM_FAIL) - if self._retry_flag and (self._tries <= self._max_retries): + if self._retry_flag and (self._tries <= self._max_retries) and not self._scheduler.terminated: self.spawn() return -- cgit v1.2.1