diff options
| author | Qinusty <jrsmith9822@gmail.com> | 2018-08-20 10:06:48 +0000 |
|---|---|---|
| committer | Qinusty <jrsmith9822@gmail.com> | 2018-08-20 10:06:48 +0000 |
| commit | ef103572d8394f2f22718a6c502fba97e9c7f88e (patch) | |
| tree | 150c211d4db91f2a22e52dd8996d997959cfb2fd | |
| parent | eda495a5be098e575ecae9c4c8393cf0c0b36d69 (diff) | |
| parent | ef5f6a617f324285d34450945fd228a8e34fadb0 (diff) | |
| download | buildstream-ef103572d8394f2f22718a6c502fba97e9c7f88e.tar.gz | |
Merge branch 'Qinusty/terminate-retries-backport-1.2' into 'bst-1.2'
Backport: Prevent terminated jobs retrying
See merge request BuildStream/buildstream!681
| -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 |