[Notes] [Git][BuildStream/buildstream][master] 2 commits: job.py: Prevent terminated jobs retrying

[Qinusty <gitlab mg gitlab com>]

Title: GitLab

Qinusty pushed to branch master at BuildStream / buildstream

Commits:

• 7263ea8c
  by Josh Smith at 2018-08-17T13:19:23Z

  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.
  

• 30f696f2
  by Qinusty at 2018-08-17T14:29:45Z

  Merge branch 'Qinusty/531-fetch-retries-on-terminate' into 'master'
  
  Prevent jobs retrying on terminate
  
  Closes #531
  
  See merge request BuildStream/buildstream!662

1 changed file:

• buildstream/_scheduler/jobs/job.py

Changes:

buildstream/_scheduler/jobs/job.py

---

...	...	@@ -250,7 +250,7 @@ class Job():
250	250	#
251	251	def resume(self, silent=False):
252	252	if self._suspended:
253		- if not silent:
	253	+ if not silent and not self._scheduler.terminated:
254	254	self.message(MessageType.STATUS,
255	255	"{} resuming".format(self.action_name))
256	256
...	...	@@ -549,7 +549,7 @@ class Job():
549	549	#
550	550	self._retry_flag = returncode not in (RC_OK, RC_PERM_FAIL)
551	551
552		- if self._retry_flag and (self._tries <= self._max_retries):
	552	+ if self._retry_flag and (self._tries <= self._max_retries) and not self._scheduler.terminated:
553	553	self.spawn()
554	554	return
555	555

—
View it on GitLab.
You're receiving this email because of your account on gitlab.com. If you'd like to receive fewer emails, you can adjust your notification settings.