Skip to content

Commit 7197de2

Browse files
committed
Update Puma Worker Killer RAM limits
1 parent 0271dec commit 7197de2

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -956,8 +956,8 @@ Below is the complete list of available options that can be used to customize yo
956956
| `PUMA_TIMEOUT` | Sets the timeout of puma worker processes. Defaults to `60` seconds. |
957957
| `PUMA_THREADS_MIN` | The number of puma minimum threads. Defaults to `1`. |
958958
| `PUMA_THREADS_MAX` | The number of puma maximum threads. Defaults to `16`. |
959-
| `PUMA_PER_WORKER_MAX_MEMORY_MB` | Maximum memory size of per puma worker process. Defaults to `850`. |
960-
| `PUMA_MASTER_MAX_MEMORY_MB` | Maximum memory size of puma master process. Defaults to `550`. |
959+
| `PUMA_PER_WORKER_MAX_MEMORY_MB` | Maximum memory size of per puma worker process. Defaults to `1024`. |
960+
| `PUMA_MASTER_MAX_MEMORY_MB` | Maximum memory size of puma master process. Defaults to `800`. |
961961
| `SIDEKIQ_CONCURRENCY` | The number of concurrent sidekiq jobs to run. Defaults to `25` |
962962
| `SIDEKIQ_SHUTDOWN_TIMEOUT` | Timeout for sidekiq shutdown. Defaults to `4` |
963963
| `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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ PUMA_THREADS_MIN=${PUMA_THREADS_MIN:-1}
6868
PUMA_THREADS_MAX=${PUMA_THREADS_MAX:-16}
6969
PUMA_WORKERS=${PUMA_WORKERS:-3}
7070
PUMA_TIMEOUT=${PUMA_TIMEOUT:-60}
71-
PUMA_PER_WORKER_MAX_MEMORY_MB=${PUMA_PER_WORKER_MAX_MEMORY_MB:-850}
72-
PUMA_MASTER_MAX_MEMORY_MB=${PUMA_MASTER_MAX_MEMORY_MB:-550}
71+
PUMA_PER_WORKER_MAX_MEMORY_MB=${PUMA_PER_WORKER_MAX_MEMORY_MB:-1024}
72+
PUMA_MASTER_MAX_MEMORY_MB=${PUMA_MASTER_MAX_MEMORY_MB:-800}
7373

7474
# Set Default values according to the documentation
7575
# https://docs.gitlab.com/ee/administration/operations/unicorn.html#unicorn-worker-killer

0 commit comments

Comments
 (0)