Skip to content

SlurmSpawner: make "srun" optional #93

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 1 commit into from
Jun 19, 2018
Merged

SlurmSpawner: make "srun" optional #93

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 6 additions & 1 deletion batchspawner/batchspawner.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -513,6 +513,11 @@ class SlurmSpawner(UserEnvMixin,BatchSpawnerRegexStates):
help="QoS name to submit job to resource manager"
).tag(config=True)

req_srun = Unicode('srun',
help="Job step wrapper, default 'srun'. Set to '' you do not want "
"to run in job step (affects environment handling)"
).tag(config=True)

batch_script = Unicode("""#!/bin/bash
#SBATCH --output={{homedir}}/jupyterhub_slurmspawner_%j.log
#SBATCH --job-name=spawner-jupyterhub
Expand All @@ -528,7 +533,7 @@ class SlurmSpawner(UserEnvMixin,BatchSpawnerRegexStates):
trap 'echo SIGTERM received' TERM
{{prologue}}
which jupyterhub-singleuser
srun {{cmd}}
{% if srun %}{{srun}} {% endif %}{{cmd}}
echo "jupyterhub-singleuser ended gracefully"
{{epilogue}}
""").tag(config=True)
Expand Down