Pass parameters of puma_worker_killer to puma config (#2124)

Author: sue445

README.md

@@ -933,6 +933,8 @@ Below is the complete list of available options that can be used to customize yo
 | `PUMA_TIMEOUT` | Sets the timeout of puma worker processes. Defaults to `60` seconds. |
 | `PUMA_THREADS_MIN` | The number of puma minimum threads. Defaults to `1`. |
 | `PUMA_THREADS_MAX` | The number of puma maximum threads. Defaults to `16`. |
+| `PUMA_PER_WORKER_MAX_MEMORY_MB` | Maximum memory size of per puma worker process. Defaults to `850`. |
+| `PUMA_MASTER_MAX_MEMORY_MB` | Maximum memory size of puma master process. Defaults to `550`. |
 | `SIDEKIQ_CONCURRENCY` | The number of concurrent sidekiq jobs to run. Defaults to `25` |
 | `SIDEKIQ_SHUTDOWN_TIMEOUT` | Timeout for sidekiq shutdown. Defaults to `4` |
 | `SIDEKIQ_MEMORY_KILLER_MAX_RSS` | Non-zero value enables the SidekiqMemoryKiller. Defaults to `1000000`. For additional options refer [Configuring the MemoryKiller](http://doc.gitlab.com/ce/operations/sidekiq_memory_killer.html) |

assets/runtime/config/gitlabhq/puma.rb

@@ -55,7 +55,7 @@
 
 before_fork do
   # Signal to the puma killer
-  Gitlab::Cluster::PumaWorkerKillerInitializer.start @config.options unless ENV['DISABLE_PUMA_WORKER_KILLER']
+  Gitlab::Cluster::PumaWorkerKillerInitializer.start(@config.options, puma_per_worker_max_memory_mb: {{PUMA_PER_WORKER_MAX_MEMORY_MB}}, puma_master_max_memory_mb: {{PUMA_MASTER_MAX_MEMORY_MB}}) unless ENV['DISABLE_PUMA_WORKER_KILLER']
 
   # Signal application hooks that we're about to fork
   Gitlab::Cluster::LifecycleEvents.do_before_fork

assets/runtime/env-defaults

@@ -66,6 +66,8 @@ PUMA_THREADS_MIN=${PUMA_THREADS_MIN:-1}
 PUMA_THREADS_MAX=${PUMA_THREADS_MAX:-16}
 PUMA_WORKERS=${PUMA_WORKERS:-3}
 PUMA_TIMEOUT=${PUMA_TIMEOUT:-60}
+PUMA_PER_WORKER_MAX_MEMORY_MB=${PUMA_PER_WORKER_MAX_MEMORY_MB:-850}
+PUMA_MASTER_MAX_MEMORY_MB=${PUMA_MASTER_MAX_MEMORY_MB:-550}
 
 # Set Default values according to the documentation
 # https://docs.gitlab.com/ee/administration/operations/unicorn.html#unicorn-worker-killer

assets/runtime/functions

@@ -278,6 +278,8 @@ gitlab_configure_puma() {
     PUMA_THREADS_MIN \
     PUMA_THREADS_MAX \
     PUMA_WORKERS \
+    PUMA_PER_WORKER_MAX_MEMORY_MB \
+    PUMA_MASTER_MAX_MEMORY_MB \
     GITLAB_INSTALL_DIR \
     GITLAB_INSTALL_DIR \
     PUMA_TIMEOUT \