Skip to content
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

Add starter environment configuration #76

Merged
merged 2 commits into from
Sep 21, 2017
Merged

Add starter environment configuration #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
17d134a
Add configuration of STARTER_JOB_ENVIRONMENT.
olifre Sep 20, 2017
3a7df5e
README: Explain usecase of starter_job_environment with singularity.
olifre Sep 20, 2017
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
2 changes: 2 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,12 @@ force_singularity_jobs => true,
singularity_image_expr => "/images/myimage.img",
singularity_bind_paths => ['/some_shared_filesystem', '/pool', '/usr/libexec/condor/'],
singularity_target_dir => '/srv',
starter_job_environment => { 'SINGULARITY_HOME' => '/srv' },
mount_under_scratch_dirs => ['/tmp','/var/tmp'],
```
This forces all jobs to run inside Singularity containers, while offering `tmp` space inside the container, and binding a shared filesystem mount point and HTCondor-specific directories inside.
The binding of the two HTCondor specific directories is a workaround to allow interactive jobs to run, this will hopefully be fixed in a future HTCondor release.
The same holds for setting `SINGULARITY_HOME`: This ensures non-interactive jobs start in the job's working directory instead of the user's home directory which might not even be accessible from the worker.

The Image may also be an expression to allow for user configuration, more details on that are provided in the [HTCondor documentation](https://research.cs.wisc.edu/htcondor/manual/latest/3_17Singularity_Support.html).

Expand Down
1 change: 1 addition & 0 deletions manifests/config/worker.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
$memory_overcommit = $htcondor::memory_overcommit
$number_of_cpus = $htcondor::number_of_cpus
$partitionable_slots = $htcondor::partitionable_slots
$starter_job_environment = $htcondor::starter_job_environment
$pool_create = $htcondor::pool_create
$pool_home = $htcondor::pool_home
$use_pid_namespaces = $htcondor::use_pid_namespaces
Expand Down
1 change: 1 addition & 0 deletions manifests/init.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@
$request_memory = $htcondor::params::request_memory,
$certificate_mapfile = $htcondor::params::certificate_mapfile,
$kerberos_mapfile = $htcondor::params::kerberos_mapfile,
$starter_job_environment = $htcondor::params::starter_job_environment,
$pool_home = $htcondor::params::pool_home,
$pool_create = $htcondor::params::pool_create,
$mount_under_scratch_dirs = $htcondor::params::mount_under_scratch_dirs,
Expand Down
1 change: 1 addition & 0 deletions manifests/params.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@
$memory_overcommit = hiera('memory_overcommit', 1.5)
$request_memory = hiera('request_memory', true)

$starter_job_environment = hiera_hash('starter_job_environment', {})
$pool_home = hiera('pool_home', '/pool')
$pool_create = hiera('pool_create', true)
$mount_under_scratch_dirs = hiera_array('mount_under_scratch_dirs', ['/tmp', '/var/tmp'])
Expand Down
3 changes: 3 additions & 0 deletions templates/20_workernode.config.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,9 @@ MAXJOBRETIREMENTTIME = $(HOUR) * 24 * 3
UPDATE_INTERVAL = $RANDOM_INTEGER(230, 370)
MASTER_UPDATE_INTERVAL = $RANDOM_INTEGER(230, 370)

## Special environment setup
STARTER_JOB_ENVIRONMENT = "<%= @starter_job_environment.map{|e| e.join('=')}.join(" ") %>"

## Location of scratch directories
EXECUTE = <%= @pool_home %>/condor

Expand Down