From d9c72cac78c3bc226be4559923499360f95b4887 Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Mon, 21 Nov 2016 08:34:09 -0800 Subject: [PATCH 1/2] Move repository update mirror jobs to project_mirror Sidekiq jobs --- app/workers/repository_update_mirror_dispatch_worker.rb | 2 +- app/workers/repository_update_mirror_worker.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/workers/repository_update_mirror_dispatch_worker.rb b/app/workers/repository_update_mirror_dispatch_worker.rb index 6fe96efdbb4277..42009f5b0432c3 100644 --- a/app/workers/repository_update_mirror_dispatch_worker.rb +++ b/app/workers/repository_update_mirror_dispatch_worker.rb @@ -3,7 +3,7 @@ class RepositoryUpdateMirrorDispatchWorker LEASE_TIMEOUT = 5.minutes - sidekiq_options queue: :gitlab_shell + sidekiq_options queue: :project_mirror attr_accessor :project, :repository, :current_user diff --git a/app/workers/repository_update_mirror_worker.rb b/app/workers/repository_update_mirror_worker.rb index d0c372542d5059..d512b8fdcba569 100644 --- a/app/workers/repository_update_mirror_worker.rb +++ b/app/workers/repository_update_mirror_worker.rb @@ -5,7 +5,7 @@ class UpdateMirrorError < StandardError; end include Gitlab::ShellAdapter # Retry not neccessary. It will try again at the next update interval. - sidekiq_options queue: :gitlab_shell, retry: false + sidekiq_options queue: :project_mirror, retry: false attr_accessor :project, :repository, :current_user -- GitLab From 357f775967b0d53b6a1e378633925c6d22cb0111 Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Mon, 21 Nov 2016 08:46:40 -0800 Subject: [PATCH 2/2] Add project_mirror queue to EE-specific queues --- config/sidekiq_queues.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/config/sidekiq_queues.yml b/config/sidekiq_queues.yml index 39491c939fd4c5..a72505bc21a9a5 100644 --- a/config/sidekiq_queues.yml +++ b/config/sidekiq_queues.yml @@ -52,6 +52,7 @@ - [pages, 1] - [elasticsearch, 1] - [geo, 1] + - [project_mirror, 1] - [project_update_repository_storage, 1] - [admin_emails, 1] - [geo_repository_update, 1] -- GitLab