summaryrefslogtreecommitdiff
path: root/lib/gitlab/cluster/puma_worker_killer_initializer.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/gitlab/cluster/puma_worker_killer_initializer.rb')
-rw-r--r--lib/gitlab/cluster/puma_worker_killer_initializer.rb4
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|