Skip to content

FIX: SLURM plugin polling #2693

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 17, 2018
Merged

FIX: SLURM plugin polling #2693

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0d7b0c9
FIX: catch exception if jobid not found in squeue call
mgxd Sep 4, 2018
5653828
FIX: make exception explicit
mgxd Sep 14, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions nipype/pipeline/plugins/slurm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,13 +62,17 @@ def __init__(self, **kwargs):
super(SLURMPlugin, self).__init__(self._template, **kwargs)

def _is_pending(self, taskid):
# subprocess.Popen requires taskid to be a string
res = CommandLine(
'squeue',
args=' '.join(['-j', '%s' % taskid]),
resource_monitor=False,
terminal_output='allatonce').run()
return res.runtime.stdout.find(str(taskid)) > -1
try:
res = CommandLine(
'squeue',
args=' '.join(['-j', '%s' % taskid]),
resource_monitor=False,
terminal_output='allatonce').run()
return res.runtime.stdout.find(str(taskid)) > -1
except Exception as e:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Based on #1853 (comment), I think this should specifically be RuntimeError?

Otherwise, this looks reasonable.

if 'Invalid job id' not in str(e):
raise(e)
return False

def _submit_batchtask(self, scriptfile, node):
"""
Expand Down