Skip to content

Commit

Permalink
Kill all grid engine jobs on shutdown (#5083)
Browse files Browse the repository at this point in the history
  • Loading branch information
adamnovak committed Sep 16, 2024
1 parent c65ee36 commit 3c4b121
Showing 1 changed file with 8 additions and 1 deletion.
9 changes: 8 additions & 1 deletion src/toil/batchSystems/abstractGridEngineBatchSystem.py
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,8 @@ def _runStep(self):
newJob = self.newJobsQueue.get()
if newJob is None:
logger.debug('Received queue sentinel.')
# Send out kill signals before stopping
self.killJobs()
return False
if self.killJobs():
activity = True
Expand Down Expand Up @@ -414,7 +416,7 @@ def issueBatchJob(self, command: str, jobDesc, job_environment: Optional[Dict[st
gpus = accelerator['count']
else:
gpus = jobDesc.accelerators

self.newJobsQueue.put((jobID, jobDesc.cores, jobDesc.memory, command, get_job_kind(jobDesc.get_names()),
job_environment, gpus))
logger.debug("Issued the job command: %s with job id: %s and job name %s", command, str(jobID),
Expand Down Expand Up @@ -497,6 +499,11 @@ def shutdown(self) -> None:
"""
Signals thread to shutdown (via sentinel) then cleanly joins the thread
"""

for jobID in self.getIssuedBatchJobIDs():
# Send kill signals to any jobs that might be running
self.killQueue.put(jobID)

self.shutdownLocal()
newJobsQueue = self.newJobsQueue
self.newJobsQueue = None
Expand Down

0 comments on commit 3c4b121

Please sign in to comment.