diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-26 21:19:16 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-26 21:19:16 +0300 |
| commit | fa69a57b46f4893c488445f79d6d290463820f7d (patch) | |
| tree | 4a73ccd1f8ffb4dbb47a42c6edb309238828a44e /app/workers | |
| parent | 34283a71d9ac31eb4da0b59d0b25fc2be014bc9c (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/workers')
3 files changed, 0 insertions, 12 deletions
diff --git a/app/workers/gitlab/github_import/stage/finish_import_worker.rb b/app/workers/gitlab/github_import/stage/finish_import_worker.rb index 5197c1e1e88..e716eda5c99 100644 --- a/app/workers/gitlab/github_import/stage/finish_import_worker.rb +++ b/app/workers/gitlab/github_import/stage/finish_import_worker.rb @@ -12,10 +12,6 @@ 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_FINISH_IMPORT_WORKER_MEMORY_GROWTH_KB', 50).to_i - sidekiq_options memory_killer_max_memory_growth_kb: ENV.fetch('MEMORY_KILLER_FINISH_IMPORT_WORKER_MAX_MEMORY_GROWTH_KB', 200_000).to_i - # project - An instance of Project. def import(_, project) @project = project 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 e13f43ee1f3..d998771b328 100644 --- a/app/workers/gitlab/github_import/stage/import_repository_worker.rb +++ b/app/workers/gitlab/github_import/stage/import_repository_worker.rb @@ -12,10 +12,6 @@ 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) diff --git a/app/workers/repository_import_worker.rb b/app/workers/repository_import_worker.rb index 641b2291896..c16071e8e31 100644 --- a/app/workers/repository_import_worker.rb +++ b/app/workers/repository_import_worker.rb @@ -14,10 +14,6 @@ class RepositoryImportWorker # rubocop:disable Scalability/IdempotentWorker sidekiq_options status_expiration: Gitlab::Import::StuckImportJob::IMPORT_JOBS_EXPIRATION worker_resource_boundary :memory - # technical debt: https://gitlab.com/gitlab-org/gitlab/issues/33991 - sidekiq_options memory_killer_memory_growth_kb: ENV.fetch('MEMORY_KILLER_REPOSITORY_IMPORT_WORKER_MEMORY_GROWTH_KB', 50).to_i - sidekiq_options memory_killer_max_memory_growth_kb: ENV.fetch('MEMORY_KILLER_REPOSITORY_IMPORT_WORKER_MAX_MEMORY_GROWTH_KB', 300_000).to_i - def perform(project_id) @project = Project.find_by_id(project_id) return if project.nil? || !start_import? |