diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-15 12:06:09 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-15 12:06:09 +0300 |
commit | 3d13802bc2c9400ea33defdd43bff6d904ee9c4d (patch) | |
tree | 44f66ca61ea85130cf210d013b737642ce9c7794 /app/workers/gitlab/github_import/stage/import_repository_worker.rb | |
parent | 00050519d16f7c0296fa0113de7065a607862501 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/workers/gitlab/github_import/stage/import_repository_worker.rb')
-rw-r--r-- | app/workers/gitlab/github_import/stage/import_repository_worker.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/workers/gitlab/github_import/stage/import_repository_worker.rb b/app/workers/gitlab/github_import/stage/import_repository_worker.rb index 4d16cef1130..b5e30470070 100644 --- a/app/workers/gitlab/github_import/stage/import_repository_worker.rb +++ b/app/workers/gitlab/github_import/stage/import_repository_worker.rb @@ -8,6 +8,10 @@ module Gitlab include GithubImport::Queue include StageMethods + # technical debt: https://gitlab.com/gitlab-org/gitlab/issues/33991 + sidekiq_options memory_killer_memory_growth_kb: ENV.fetch('MEMORY_KILLER_IMPORT_REPOSITORY_WORKER_MEMORY_GROWTH_KB', 50).to_i + sidekiq_options memory_killer_max_memory_growth_kb: ENV.fetch('MEMORY_KILLER_IMPORT_REPOSITORY_WORKER_MAX_MEMORY_GROWTH_KB', 300_000).to_i + # client - An instance of Gitlab::GithubImport::Client. # project - An instance of Project. def import(client, project) |