Merge pull request #2314 from 3kami3/update-puma-memory-limits

Update Puma Worker Killer RAM limits

Author: Sameer Naik

README.md

@@ -956,8 +956,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`. |
+| `PUMA_PER_WORKER_MAX_MEMORY_MB` | Maximum memory size of per puma worker process. Defaults to `1024`. |
+| `PUMA_MASTER_MAX_MEMORY_MB` | Maximum memory size of puma master process. Defaults to `800`. |
 | `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/env-defaults

@@ -68,8 +68,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}
+PUMA_PER_WORKER_MAX_MEMORY_MB=${PUMA_PER_WORKER_MAX_MEMORY_MB:-1024}
+PUMA_MASTER_MAX_MEMORY_MB=${PUMA_MASTER_MAX_MEMORY_MB:-800}
 
 # Set Default values according to the documentation
 # https://docs.gitlab.com/ee/administration/operations/unicorn.html#unicorn-worker-killer