init: added SIDEKIQ_MEMORY_KILLER_MAX_RSS configuration option

kkimurak · May 21, 2015 · e4008cc · e4008cc
1 parent 7039732
commit e4008cc
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 0 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -2,6 +2,9 @@
 
 This file only reflects the changes that are made in the the docker image. Please refer to the upstream GitLab [CHANGELOG](https://github.com/gitlabhq/gitlabhq/blob/master/CHANGELOG) for the list of changes in GitLab.
 
+**latest**
+- init: added `SIDEKIQ_MEMORY_KILLER_MAX_RSS` configuration option
+
 **7.10.4**
 - gitlab: upgrade to CE v.7.10.4
 

diff --git a/README.md b/README.md
@@ -771,6 +771,7 @@ Below is the complete list of available options that can be used to customize yo
 - **UNICORN_WORKERS**: The number of unicorn workers to start. Defaults to `3`.
 - **UNICORN_TIMEOUT**: Sets the timeout of unicorn worker processes. Defaults to `60` seconds.
 - **SIDEKIQ_CONCURRENCY**: The number of concurrent sidekiq jobs to run. Defaults to `25`
+- **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)
 - **DB_TYPE**: The database type. Possible values: `mysql`, `postgres`. Defaults to `mysql`.
 - **DB_HOST**: The database server hostname. Defaults to `localhost`.
 - **DB_PORT**: The database server port. Defaults to `3306` for mysql and `5432` for postgresql.

diff --git a/assets/init b/assets/init
@@ -68,7 +68,9 @@ REDIS_PORT=${REDIS_PORT:-}
 
 UNICORN_WORKERS=${UNICORN_WORKERS:-3}
 UNICORN_TIMEOUT=${UNICORN_TIMEOUT:-60}
+
 SIDEKIQ_CONCURRENCY=${SIDEKIQ_CONCURRENCY:-25}
+SIDEKIQ_MEMORY_KILLER_MAX_RSS=${SIDEKIQ_MEMORY_KILLER_MAX_RSS:-1000000}
 
 DB_TYPE=${DB_TYPE:-}
 DB_HOST=${DB_HOST:-}
@@ -400,6 +402,17 @@ sudo -u git -H sed 's/{{DB_POOL}}/'"${DB_POOL}"'/' -i config/database.yml
 # configure sidekiq concurrency
 sed 's/{{SIDEKIQ_CONCURRENCY}}/'"${SIDEKIQ_CONCURRENCY}"'/' -i /etc/supervisor/conf.d/sidekiq.conf
 
+# enable SidekiqMemoryKiller
+## The MemoryKiller is enabled by gitlab if the `SIDEKIQ_MEMORY_KILLER_MAX_RSS` is
+## defined in the programs environment and has a non-zero value.
+##
+## Simply exporting the variable makes it available in the programs environment and
+## therefore should enable the MemoryKiller.
+##
+## Every other MemoryKiller option specified in the docker env will automatically
+## be exported, so why bother
+export SIDEKIQ_MEMORY_KILLER_MAX_RSS
+
 # configure redis
 sudo -u git -H sed 's/{{REDIS_HOST}}/'"${REDIS_HOST}"'/g' -i config/resque.yml
 sudo -u git -H sed 's/{{REDIS_PORT}}/'"${REDIS_PORT}"'/g' -i config/resque.yml