Merge pull request #96 from ccin2p3/feature/cgroup_memory_limit

CGROUP_MEMORY_LIMIT_POLICY customizable
HEP-Puppet · Jul 17, 2018 · 452f04b · 452f04b
2 parents 0f64542 + 363be2a
commit 452f04b
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 1 deletion.
diff --git a/manifests/config/worker.pp b/manifests/config/worker.pp
@@ -13,6 +13,7 @@
   $daemon_list               = $htcondor::config::daemon_list
   $enable_cgroup             = $htcondor::enable_cgroup
   $htcondor_cgroup           = $htcondor::htcondor_cgroup
+  $cgroup_memory_limit       = $htcondor::cgroup_memory_limit
   $enable_healthcheck        = $htcondor::enable_healthcheck
   $machine_owner             = $htcondor::machine_owner
   $memory_overcommit         = $htcondor::memory_overcommit

diff --git a/manifests/init.pp b/manifests/init.pp
@@ -122,6 +122,7 @@
   $enable_multicore               = $htcondor::params::enable_multicore,
   $enable_healthcheck             = $htcondor::params::enable_healthcheck,
   $htcondor_cgroup                = $htcondor::params::htcondor_cgroup,
+  $cgroup_memory_limit            = $htcondor::params::cgroup_memory_limit,
   $high_priority_groups           = $htcondor::params::high_priority_groups,
   $priority_halflife              = $htcondor::params::priority_halflife,
   $default_prio_factor            = $htcondor::params::default_prio_factor,

diff --git a/manifests/params.pp b/manifests/params.pp
@@ -33,6 +33,7 @@
     $htcondor_cgroup_default = 'htcondor'
   }
   $htcondor_cgroup                = hiera('htcondor_cgroup', $htcondor_cgroup_default)
+  $cgroup_memory_limit            = hiera('cgroup_memory_limit', 'soft')
 
 
   $high_priority_groups           = hiera_hash('high_priority_groups', undef)

diff --git a/templates/20_workernode.config.erb b/templates/20_workernode.config.erb
@@ -114,7 +114,7 @@ MAX_NUM_STARTD_LOG = 10
 <%- if @enable_cgroup -%>
 # Enable CGROUP
 BASE_CGROUP = <%= @htcondor_cgroup %>
-CGROUP_MEMORY_LIMIT_POLICY = soft
+CGROUP_MEMORY_LIMIT_POLICY = <%= @cgroup_memory_limit %>
 <%- end -%>
 
 ## Debugging