diff options
| author | Qinusty <jrsmith9822@gmail.com> | 2018-08-17 14:29:45 +0000 |
|---|---|---|
| committer | Qinusty <jrsmith9822@gmail.com> | 2018-08-20 08:10:33 +0000 |
| commit | 4613e038cc039af52fade99174b5105104690223 (patch) | |
| tree | 150c211d4db91f2a22e52dd8996d997959cfb2fd | |
| parent | eda495a5be098e575ecae9c4c8393cf0c0b36d69 (diff) | |
| download | buildstream-cherry-pick-30f696f2.tar.gz | |
Merge branch 'Qinusty/531-fetch-retries-on-terminate' into 'master'cherry-pick-30f696f2
Prevent jobs retrying on terminate
Closes #531
See merge request BuildStream/buildstream!662
(cherry picked from commit 30f696f27a4a5281af86d9e41ecc2e4c2ef32ebf)
7263ea8c job.py: Prevent terminated jobs retrying
| -rw-r--r-- | buildstream/_scheduler/jobs/job.py | 4 |
1 files 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 |