Merge pull request sameersbn#2716 from kkimurak/increase-default-side…

…kiq-memory-killer-max-rss Increase default value for SIDEKIQ_MEMORY_KILLER_MAX_RSS to 2GB
priyankub · Mar 12, 2023 · 9e58a67 · 9e58a67
2 parents 1d85fef + 255ec94
commit 9e58a67
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -1746,7 +1746,7 @@ 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)
+Non-zero value enables the SidekiqMemoryKiller. Defaults to `2000000`. For additional options refer [Configuring the MemoryKiller](http://doc.gitlab.com/ce/operations/sidekiq_memory_killer.html)
 
 ##### `GITLAB_SIDEKIQ_LOG_FORMAT`
 

diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults
@@ -62,7 +62,7 @@ REDIS_DB_NUMBER=${REDIS_DB_NUMBER:-0}
 ## SIDEKIQ
 SIDEKIQ_SHUTDOWN_TIMEOUT=${SIDEKIQ_SHUTDOWN_TIMEOUT:-4}
 SIDEKIQ_CONCURRENCY=${SIDEKIQ_CONCURRENCY:-25}
-SIDEKIQ_MEMORY_KILLER_MAX_RSS=${SIDEKIQ_MEMORY_KILLER_MAX_RSS:-1000000}
+SIDEKIQ_MEMORY_KILLER_MAX_RSS=${SIDEKIQ_MEMORY_KILLER_MAX_RSS:-2000000}
 GITLAB_SIDEKIQ_LOG_FORMAT=${GITLAB_SIDEKIQ_LOG_FORMAT:-json}
 
 ## PUMA