diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-18 21:06:14 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-18 21:06:14 +0300 |
| commit | b08279013423a66f06f5edde4e067f328fe135bd (patch) | |
| tree | 47aca1a9b0655cd7861bddf31ec17d4b302fc4ea /doc/user/gitlab_com | |
| parent | 4584eb0e07d372d6014de16ab359965475184c99 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user/gitlab_com')
| -rw-r--r-- | doc/user/gitlab_com/index.md | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/doc/user/gitlab_com/index.md b/doc/user/gitlab_com/index.md index 463ce2056fc..7340ba713ff 100644 --- a/doc/user/gitlab_com/index.md +++ b/doc/user/gitlab_com/index.md @@ -177,11 +177,15 @@ sentry_dsn = "X" GitLab.com runs [Sidekiq][sidekiq] with arguments `--timeout=4 --concurrency=4` and the following environment variables: -| Setting | GitLab.com | Default | -|-------- |----------- |-------- | -| `SIDEKIQ_MEMORY_KILLER_MAX_RSS` | `1000000` | `2000000` | -| `SIDEKIQ_MEMORY_KILLER_SHUTDOWN_SIGNAL` | `SIGKILL` | - | -| `SIDEKIQ_LOG_ARGUMENTS` | `1` | - | +| Setting | GitLab.com | Default | +|-------- |----------- |-------- | +| `SIDEKIQ_DAEMON_MEMORY_KILLER` | - | - | +| `SIDEKIQ_MEMORY_KILLER_MAX_RSS` | `16000000` | `2000000` | +| `SIDEKIQ_MEMORY_KILLER_HARD_LIMIT_RSS` | - | - | +| `SIDEKIQ_MEMORY_KILLER_CHECK_INTERVAL` | - | `3` | +| `SIDEKIQ_MEMORY_KILLER_GRACE_TIME` | - | `900` | +| `SIDEKIQ_MEMORY_KILLER_SHUTDOWN_WAIT` | - | `30` | +| `SIDEKIQ_LOG_ARGUMENTS` | `1` | - | ## Cron jobs |