diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-23 06:06:19 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-23 06:06:19 +0000 |
| commit | 89861e72b7375353654513aa2bc0a3b60a5e4377 (patch) | |
| tree | 60e5424a064977a346eaf5f06720dc74af54d720 /doc/user/gitlab_com | |
| parent | 98dbb0a488d7b0093f352938210d9578b0f7a8a6 (diff) | |
| download | gitlab-ce-89861e72b7375353654513aa2bc0a3b60a5e4377.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user/gitlab_com')
| -rw-r--r-- | doc/user/gitlab_com/index.md | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/doc/user/gitlab_com/index.md b/doc/user/gitlab_com/index.md index 7340ba713ff..222c0f79fc6 100644 --- a/doc/user/gitlab_com/index.md +++ b/doc/user/gitlab_com/index.md @@ -180,13 +180,17 @@ and the following environment variables: | Setting | GitLab.com | Default | |-------- |----------- |-------- | | `SIDEKIQ_DAEMON_MEMORY_KILLER` | - | - | -| `SIDEKIQ_MEMORY_KILLER_MAX_RSS` | `16000000` | `2000000` | +| `SIDEKIQ_MEMORY_KILLER_MAX_RSS` | `2000000` | `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` | - | +NOTE: **Note:** +The `SIDEKIQ_MEMORY_KILLER_MAX_RSS` setting is `16000000` on Sidekiq import +nodes and Sidekiq export nodes. + ## Cron jobs Periodically executed jobs by Sidekiq, to self-heal GitLab, do external |