diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-15 18:08:45 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-15 18:08:45 +0300 |
| commit | d9e71b0d412fb9d2d7fc8b00dddac21617eaaf19 (patch) | |
| tree | 704cd8a52cf1e068bcd2e82cc1a0112e9674ef5d /lib/gitlab/cluster | |
| parent | 6ae38bb3b5dc719fb6a046dcbcce4671176395a2 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/cluster')
| -rw-r--r-- | lib/gitlab/cluster/puma_worker_killer_initializer.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/cluster/puma_worker_killer_initializer.rb b/lib/gitlab/cluster/puma_worker_killer_initializer.rb index 92c799875b5..822012e0ed6 100644 --- a/lib/gitlab/cluster/puma_worker_killer_initializer.rb +++ b/lib/gitlab/cluster/puma_worker_killer_initializer.rb @@ -5,8 +5,8 @@ module Gitlab class PumaWorkerKillerInitializer def self.start( puma_options, - puma_per_worker_max_memory_mb: 850, - puma_master_max_memory_mb: 550, + puma_per_worker_max_memory_mb: 1024, + puma_master_max_memory_mb: 800, additional_puma_dev_max_memory_mb: 200 ) require 'puma_worker_killer' |