Skip to content
Snippets Groups Projects
Commit ef5f6a61 authored by Qinusty's avatar Qinusty
Browse files

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.
parent eda495a5
No related branches found
No related tags found
1 merge request!681Backport: Prevent terminated jobs retrying
Pipeline #28241266 passed
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment