diff options
| author | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-04-27 21:05:30 +0300 |
|---|---|---|
| committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-04-27 21:05:30 +0300 |
| commit | 0863644a90008d3433348107c77e8dea76d5a22b (patch) | |
| tree | f9d09b75ad27ddd8b648f1756d12019900f8e0c7 /doc | |
| parent | 90c966500ab7177d80c96aebf42f95b9c814f7b6 (diff) | |
| parent | cdf91da3ebb2ca8795ea88365792333a957e6cfa (diff) | |
Merge branch 'fix-operations-doc' into 'master'
Sidekiq MemoryKiller sends a `SIGKILL` signal, not `SIGTERM`
As documented in https://gitlab.com/gitlab-org/gitlab-ce/blob/f127edd012bd8b6f76ac67d69aadbd7d4837258f/lib/gitlab/sidekiq_middleware/memory_killer.rb#L10 (this was changed by c291ff9c6f795821e5b73447984e4cd72f3701a4).
See merge request !3927
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/operations/sidekiq_memory_killer.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/operations/sidekiq_memory_killer.md b/doc/operations/sidekiq_memory_killer.md index 811c2192a19..b5e78348989 100644 --- a/doc/operations/sidekiq_memory_killer.md +++ b/doc/operations/sidekiq_memory_killer.md @@ -36,5 +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 +- `SIDEKIQ_MEMORY_KILLER_SHUTDOWN_SIGNAL`: defaults to `SIGKILL`. The name of the final signal sent to the Sidekiq process when we want it to shut down. |