Enable clustered mode in production

Author: alexeyr

.github/workflows/benchmark.yml

@@ -34,6 +34,11 @@ on:
         required: false
         default: 'fortio,vegeta,k6'
         type: string
+      web_concurrency:
+        description: 'Number of Puma worker processes'
+        required: false
+        default: 2
+        type: number
   push:
     branches:
       - master
@@ -49,6 +54,7 @@ env:
   REQUEST_TIMEOUT: ${{ github.event.inputs.request_timeout || '60s' }}
   VUS: ${{ github.event.inputs.vus || '100' }}
   TOOLS: ${{ github.event.inputs.tools || 'fortio,vegeta,k6' }}
+  WEB_CONCURRENCY: ${{ github.event.inputs.web_concurrency || '2' }}
 
 jobs:
   benchmark:
@@ -254,8 +260,10 @@ jobs:
           echo "Benchmark parameters:"
           echo "  - RATE: ${RATE}"
           echo "  - DURATION_SEC: ${DURATION_SEC}"
+          echo "  - REQUEST_TIMEOUT: ${REQUEST_TIMEOUT}"
           echo "  - VUS: ${VUS}"
           echo "  - TOOLS: ${TOOLS}"
+          echo "  - WEB_CONCURRENCY: ${WEB_CONCURRENCY}"
           echo ""
 
           if ! spec/performance/bench.sh; then

spec/dummy/config/puma.rb

@@ -10,36 +10,45 @@
 min_threads_count = ENV.fetch("RAILS_MIN_THREADS") { max_threads_count }
 threads min_threads_count, max_threads_count
 
+rails_env = ENV.fetch("RAILS_ENV", "development")
+
 # Specifies the `worker_timeout` threshold that Puma will use to wait before
 # terminating a worker in development environments.
 #
-worker_timeout 3600 if ENV.fetch("RAILS_ENV", "development") == "development"
+worker_timeout 3600 if rails_env == "development"
 
 # Specifies the `port` that Puma will listen on to receive requests; default is 3000.
 #
 port ENV.fetch("PORT", 3000)
 
 # Specifies the `environment` that Puma will run in.
 #
-environment ENV.fetch("RAILS_ENV", "development")
+environment rails_env
 
 # Specifies the `pidfile` that Puma will use.
 pidfile ENV.fetch("PIDFILE", "tmp/pids/server.pid")
 
-# Specifies the number of `workers` to boot in clustered mode.
-# Workers are forked web server processes. If using threads and workers together
-# the concurrency of the application would be max `threads` * `workers`.
-# Workers do not work on JRuby or Windows (both of which do not support
-# processes).
-#
-# workers ENV.fetch("WEB_CONCURRENCY") { 2 }
-
-# Use the `preload_app!` method when specifying a `workers` number.
-# This directive tells Puma to first boot the application and load code
-# before forking the application. This takes advantage of Copy On Write
-# process behavior so workers use less memory.
-#
-# preload_app!
+if rails_env == "production"
+  # Specifies the number of `workers` to boot in clustered mode.
+  # Workers are forked web server processes. If using threads and workers together
+  # the concurrency of the application would be max `threads` * `workers`.
+  # Workers do not work on JRuby or Windows (both of which do not support
+  # processes).
+  #
+  workers ENV.fetch("WEB_CONCURRENCY", 2)
+
+  # Use the `preload_app!` method when specifying a `workers` number.
+  # This directive tells Puma to first boot the application and load code
+  # before forking the application. This takes advantage of Copy On Write
+  # process behavior so workers use less memory.
+  #
+  preload_app!
+
+  # Specifies the `worker_shutdown_timeout` threshold that Puma will use to wait before
+  # terminating a worker.
+  #
+  worker_shutdown_timeout 60
+end
 
 # Allow puma to be restarted by `bin/rails restart` command.
 plugin :tmp_restart