Skip to content

Commit b8d43de

Browse files
committed
Merge branch 'spawner_detail' into dev
2 parents 14287ac + a696601 commit b8d43de

File tree

2 files changed

+15
-9
lines changed

2 files changed

+15
-9
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ Unless otherwise stated for a specific spawner, assume that spawners
9090
*do* evaluate shell environment for users and thus the [security
9191
requriemnts of JupyterHub security for untrusted
9292
users](https://jupyterhub.readthedocs.io/en/stable/reference/websecurity.html)
93-
are not fulfilled.
93+
are not fulfilled. This is something which we are working on.
9494

9595

9696
## Provide different configurations of BatchSpawner

SPAWNERS.md

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,13 @@ Maintainers:
1616

1717
Maintainers: @rkdarst
1818

19-
This spawner enforces the environment if `srun` is used, which is the
20-
default. If you *do* want user environment to be used, set
21-
`req_srun=''`.
19+
This spawner enforces the environment if `srun` is used to wrap the
20+
spawner command, which is the default. If you *do* want user
21+
environment to be used, set `req_srun=''`. However, this is not
22+
perfect: there is still a bash shell begun as the user which could run
23+
arbitrary startup, define shell aliases for `srun`, etc.
24+
25+
Use of `srun` is required to gracefully terminate.
2226

2327

2428
## `GridengineSpawner`
@@ -38,12 +42,14 @@ Maintainers:
3842

3943
# Checklist for making spawners
4044

41-
- Does your spawner read shell environment before starting?
45+
- Does your spawner read shell environment before starting? (See
46+
[Jupyterhub Security](https://jupyterhub.readthedocs.io/en/stable/reference/websecurity.html).
4247

4348
- Does your spawner send SIGTERM to the jupyterhub-singleuser process
4449
before SIGKILL? It should, so that the process can terminate
45-
gracefully. If you don't see the script end (e.g. you can add `echo
46-
"terminated gracefully"` to the end of your script and see it), you
47-
should check. PR #75 might help here, ask the poster to finalize
48-
it.
50+
gracefully. Add `echo "terminated gracefully"` to the end of the
51+
batch script - if you see this in your singleuser server output, you
52+
know that you DO receive SIGTERM and terminate gracefully. If your
53+
batch system can not automatically send SIGTERM before SIGKILL, PR
54+
#75 might help here, ask for it to be finished.
4955

0 commit comments

Comments
 (0)