diff options
| author | Job van der Voort <job@gitlab.com> | 2015-05-08 12:01:10 +0300 |
|---|---|---|
| committer | Job van der Voort <job@gitlab.com> | 2015-05-08 12:01:10 +0300 |
| commit | 0384d2929f25e433d394db70cfc29896fadaa4a5 (patch) | |
| tree | ba01391460943c9978c5ff8d761ddaa7ca4978c3 /doc | |
| parent | 0fc6f0b5d406f530e9ad8a35f0188536f6525cb9 (diff) | |
| parent | 1c1f18b416febb8296facca37dc7504c2da880f8 (diff) | |
Merge branch 'sidekiq-memory-killer-shutdown-signal' into 'master'
Add SIDEKIQ_MEMORY_KILLER_SHUTDOWN_SIGNAL env var
It looks like SIGTERM may not be enough to shut down a Sidekiq process
when its RSS has gotten too big. This change will allow us to experiment
with sending SIGKILL instead of SIGTERM to Sidekiq processes on
gitlab.com.
See merge request !1812
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/operations/sidekiq_memory_killer.md | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/operations/sidekiq_memory_killer.md b/doc/operations/sidekiq_memory_killer.md index 867b01b0d5a..811c2192a19 100644 --- a/doc/operations/sidekiq_memory_killer.md +++ b/doc/operations/sidekiq_memory_killer.md @@ -36,3 +36,5 @@ The MemoryKiller is controlled using environment variables. Existing jobs get 30 seconds to finish. After that, the MemoryKiller tells Sidekiq to shut down, and an external supervision mechanism (e.g. Runit) must restart Sidekiq. +- `SIDEKIQ_MEMORY_KILLER_SHUTDOWN_SIGNAL`: defaults to 'SIGTERM'. The name of + the final signal sent to the Sidekiq process when we want it to shut down. |