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/development/import_export.md | |
| parent | 4584eb0e07d372d6014de16ab359965475184c99 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/development/import_export.md')
| -rw-r--r-- | doc/development/import_export.md | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/doc/development/import_export.md b/doc/development/import_export.md index fcfb9bf4915..e9552e462c9 100644 --- a/doc/development/import_export.md +++ b/doc/development/import_export.md @@ -31,7 +31,9 @@ Read through the current performance problems using the Import/Export below. Out of memory (OOM) errors are normally caused by the [Sidekiq Memory Killer](../administration/operations/sidekiq_memory_killer.md): ```bash -SIDEKIQ_MEMORY_KILLER_MAX_RSS = 2GB in GitLab.com +SIDEKIQ_MEMORY_KILLER_MAX_RSS = 2000000 +SIDEKIQ_MEMORY_KILLER_HARD_LIMIT_RSS = 3000000 +SIDEKIQ_MEMORY_KILLER_GRACE_TIME = 900 ``` An import status `started`, and the following sidekiq logs will signal a memory issue: |