diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-15 21:09:13 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-15 21:09:13 +0300 |
| commit | 2eafcb0673f7d501d9e3fabde6e950a5dcc24fc2 (patch) | |
| tree | e209665d6c7316e8cbc526023675429cb2beebbe /lib/gitlab/cluster | |
| parent | 4279dbc29c63f614e6439e104204165ff0517a59 (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, 4 insertions, 0 deletions
diff --git a/lib/gitlab/cluster/puma_worker_killer_initializer.rb b/lib/gitlab/cluster/puma_worker_killer_initializer.rb index 5908de68687..957faf797b5 100644 --- a/lib/gitlab/cluster/puma_worker_killer_initializer.rb +++ b/lib/gitlab/cluster/puma_worker_killer_initializer.rb @@ -9,6 +9,10 @@ module Gitlab puma_master_max_memory_mb: 950, additional_puma_dev_max_memory_mb: 200) + # We are replacing PWK with Watchdog by using backward compatible RssMemoryLimit monitor by default. + # https://gitlab.com/groups/gitlab-org/-/epics/9119 + return if Gitlab::Utils.to_boolean(ENV.fetch('GITLAB_MEMORY_WATCHDOG_ENABLED', true)) + require 'puma_worker_killer' PumaWorkerKiller.config do |config| |