Add jemalloc package to missing job specs

Some jobs consume the linked property `use_jemalloc_memory_allocator` to enable jemalloc but don't specify the required package in their spec file. Resulting in jemalloc not being used. Thus the missing packages need be added. Related to commit 62c5d07/ PR #367 where we added experimental jemalloc support for all ccng based jobs.
cloudfoundry · Feb 7, 2024 · ffc33bf · ffc33bf
1 parent fad0179
commit ffc33bf
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 0 deletions.
diff --git a/jobs/cc_deployment_updater/spec b/jobs/cc_deployment_updater/spec
@@ -32,6 +32,7 @@ packages:
   - capi_utils
   - cloud_controller_ng
   - libpq
+  - jemalloc
   - mariadb_connector_c
   - ruby-3.2
 

diff --git a/jobs/cloud_controller_clock/spec b/jobs/cloud_controller_clock/spec
@@ -32,6 +32,7 @@ packages:
   - nginx
   - nginx_newrelic_plugin
   - libpq
+  - jemalloc
   - mariadb_connector_c
   - ruby-3.2
 

diff --git a/jobs/cloud_controller_worker/spec b/jobs/cloud_controller_worker/spec
@@ -37,6 +37,7 @@ packages:
   - nginx
   - nginx_newrelic_plugin
   - libpq
+  - jemalloc
   - mariadb_connector_c
   - ruby-3.2
 

diff --git a/jobs/rotate_cc_database_key/spec b/jobs/rotate_cc_database_key/spec
@@ -14,6 +14,7 @@ packages:
   - capi_utils
   - cloud_controller_ng
   - libpq
+  - jemalloc
   - mariadb_connector_c
   - ruby-3.2
 

diff --git a/jobs/rotate_cc_database_key/templates/bin/run.erb b/jobs/rotate_cc_database_key/templates/bin/run.erb
@@ -2,6 +2,10 @@
 
 set -eu
 
+<% if link("cloud_controller_internal").p('cc.experimental.use_jemalloc_memory_allocator') %>
+  export LD_PRELOAD=/var/vcap/packages/jemalloc/lib/libjemalloc.so
+<% end %>
+
 rotate() {
   export CLOUD_CONTROLLER_NG_CONFIG=/var/vcap/jobs/rotate_cc_database_key/config/cloud_controller_ng.yml
   source /var/vcap/jobs/rotate_cc_database_key/bin/ruby_version.sh