diff --git a/jobs/cc_deployment_updater/templates/bin/cc_deployment_updater.erb b/jobs/cc_deployment_updater/templates/bin/cc_deployment_updater.erb index ea1a6a475c..9f8ec58615 100644 --- a/jobs/cc_deployment_updater/templates/bin/cc_deployment_updater.erb +++ b/jobs/cc_deployment_updater/templates/bin/cc_deployment_updater.erb @@ -7,8 +7,6 @@ cd /var/vcap/packages/cloud_controller_ng/cloud_controller_ng export RUBYOPT='--yjit' <% end %> -<% if link("cloud_controller_internal").p('cc.experimental.use_jemalloc_memory_allocator') %> - export LD_PRELOAD=/var/vcap/packages/jemalloc/lib/libjemalloc.so -<% end %> +export LD_PRELOAD=/var/vcap/packages/jemalloc/lib/libjemalloc.so exec bundle exec rake deployment_updater:start diff --git a/jobs/cloud_controller_clock/templates/bin/cloud_controller_clock.erb b/jobs/cloud_controller_clock/templates/bin/cloud_controller_clock.erb index 12ffb37234..05c7daa5b5 100644 --- a/jobs/cloud_controller_clock/templates/bin/cloud_controller_clock.erb +++ b/jobs/cloud_controller_clock/templates/bin/cloud_controller_clock.erb @@ -7,8 +7,6 @@ cd /var/vcap/packages/cloud_controller_ng/cloud_controller_ng export RUBYOPT='--yjit' <% end %> -<% if link("cloud_controller_internal").p('cc.experimental.use_jemalloc_memory_allocator') %> export LD_PRELOAD=/var/vcap/packages/jemalloc/lib/libjemalloc.so -<% end %> exec bundle exec rake clock:start diff --git a/jobs/cloud_controller_ng/spec b/jobs/cloud_controller_ng/spec index f60d5f61c9..307ff1b302 100644 --- a/jobs/cloud_controller_ng/spec +++ b/jobs/cloud_controller_ng/spec @@ -163,7 +163,6 @@ provides: - cc.external_port - cc.external_protocol - cc.experimental.use_yjit_compiler - - cc.experimental.use_jemalloc_memory_allocator - cc.internal_service_hostname - cc.jobs.enable_dynamic_job_priorities - cc.log_db_queries @@ -1253,10 +1252,6 @@ properties: description: "Use Ruby's YJIT compiler when running Cloud Controller API servers and workers. This feature is experimental and not recommended. Please review the drawbacks and benefits of YJIT before enabling." default: false - cc.experimental.use_jemalloc_memory_allocator: - description: "Enables jemalloc rather than malloc for Cloud Controller API servers and workers; however, it's experimental and not typically recommended, so review its pros and cons before use." - default: false - cc.experimental.use_redis: description: "Use co-deployed Valkey (Redis fork) for rate limiting and metrics. If the Puma webserver is enabled, Valkey will automatically be used." default: false @@ -1282,5 +1277,5 @@ properties: default: false cc.temporary_enable_deprecated_thin_webserver: - description: "Use deprecated Thin webserver. Please note that when using Thin instead of Puma you miss out on the following benefits: Better resource utilization, well maintained, more performant.." + description: "Use deprecated Thin webserver. Please note that when using Thin instead of Puma you miss out on the following benefits: Better resource utilization, well maintained and more performant. Thin will be removed in a future release." default: false diff --git a/jobs/cloud_controller_ng/templates/bin/cloud_controller_ng.erb b/jobs/cloud_controller_ng/templates/bin/cloud_controller_ng.erb index c207804091..eccf57c9b6 100644 --- a/jobs/cloud_controller_ng/templates/bin/cloud_controller_ng.erb +++ b/jobs/cloud_controller_ng/templates/bin/cloud_controller_ng.erb @@ -18,9 +18,7 @@ echo 'Finished migrations and seeds' export RUBYOPT='--yjit' <% end %> -<% if p('cc.experimental.use_jemalloc_memory_allocator') %> export LD_PRELOAD=/var/vcap/packages/jemalloc/lib/libjemalloc.so -<% end %> exec /var/vcap/packages/cloud_controller_ng/cloud_controller_ng/bin/cloud_controller \ -c /var/vcap/jobs/cloud_controller_ng/config/cloud_controller_ng.yml diff --git a/jobs/cloud_controller_ng/templates/bin/local_worker.erb b/jobs/cloud_controller_ng/templates/bin/local_worker.erb index 54a34ce580..f7ba28477c 100644 --- a/jobs/cloud_controller_ng/templates/bin/local_worker.erb +++ b/jobs/cloud_controller_ng/templates/bin/local_worker.erb @@ -9,9 +9,7 @@ wait_for_blobstore export RUBYOPT='--yjit' <% end %> -<% if p('cc.experimental.use_jemalloc_memory_allocator') %> export LD_PRELOAD=/var/vcap/packages/jemalloc/lib/libjemalloc.so -<% end %> cd /var/vcap/packages/cloud_controller_ng/cloud_controller_ng exec bundle exec rake "jobs:local[cc_api_worker.<%= spec.job.name %>.<%= spec.index %>.${INDEX}]" diff --git a/jobs/cloud_controller_worker/templates/bin/cloud_controller_worker.erb b/jobs/cloud_controller_worker/templates/bin/cloud_controller_worker.erb index f220aab114..03ae14eff2 100644 --- a/jobs/cloud_controller_worker/templates/bin/cloud_controller_worker.erb +++ b/jobs/cloud_controller_worker/templates/bin/cloud_controller_worker.erb @@ -9,9 +9,7 @@ wait_for_blobstore export RUBYOPT='--yjit' <% end %> -<% if link("cloud_controller_internal").p('cc.experimental.use_jemalloc_memory_allocator') %> export LD_PRELOAD=/var/vcap/packages/jemalloc/lib/libjemalloc.so -<% end %> cd /var/vcap/packages/cloud_controller_ng/cloud_controller_ng diff --git a/jobs/rotate_cc_database_key/templates/bin/run.erb b/jobs/rotate_cc_database_key/templates/bin/run.erb index deef575606..3d4fd03ae9 100644 --- a/jobs/rotate_cc_database_key/templates/bin/run.erb +++ b/jobs/rotate_cc_database_key/templates/bin/run.erb @@ -2,9 +2,7 @@ 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 %> +export LD_PRELOAD=/var/vcap/packages/jemalloc/lib/libjemalloc.so rotate() { export CLOUD_CONTROLLER_NG_CONFIG=/var/vcap/jobs/rotate_cc_database_key/config/cloud_controller_ng.yml diff --git a/spec/cloud_controller_ng/cloud_controller_ng_spec.rb b/spec/cloud_controller_ng/cloud_controller_ng_spec.rb index 9c8be6b43c..b7133384e4 100644 --- a/spec/cloud_controller_ng/cloud_controller_ng_spec.rb +++ b/spec/cloud_controller_ng/cloud_controller_ng_spec.rb @@ -53,6 +53,7 @@ module Test 'private_endpoint' => 'https://blobstore.service.cf.internal:4443', 'public_endpoint' => 'https://blobstore.brook-sentry.capi.land', 'username' => 'blobstore-user' } }, + 'experimental' => {}, 'install_buildpacks' => [{ 'name' => 'staticfile_buildpack', 'package' => 'staticfile-buildpack' }, { 'name' => 'java_buildpack', 'package' => 'java-buildpack' }, @@ -104,8 +105,7 @@ module Test [{ 'description' => 'Cloud Foundry Linux-based filesystem', 'name' => 'cflinuxfs4' }], 'staging_upload_password' => '((cc_staging_upload_password))', - 'staging_upload_user' => 'staging_user', - 'experimental' => {} }, + 'staging_upload_user' => 'staging_user' }, 'ccdb' => { 'databases' => [{ 'name' => 'cloud_controller', 'tag' => 'cc' }], 'db_scheme' => 'mysql',