From 4b1a7f0760515750f20450aee093767b57fcef40 Mon Sep 17 00:00:00 2001 From: Drew Blessing Date: Fri, 4 Nov 2016 15:05:19 -0500 Subject: [PATCH] Disable retries for remote mirror update worker By default, Sidekiq will retry 25 times with an exponential backoff. This may result in jobs retrying for up to 21 days. That could lead to an ever-increasing queue size for the remote mirror updates. The mirrors will attempt to update again within an interval, which should be sufficient. --- app/workers/repository_update_mirror_worker.rb | 3 ++- changelogs/unreleased-ee/sidekiq_set_retries.yml | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 changelogs/unreleased-ee/sidekiq_set_retries.yml diff --git a/app/workers/repository_update_mirror_worker.rb b/app/workers/repository_update_mirror_worker.rb index b9215e32a91b62..d0c372542d5059 100644 --- a/app/workers/repository_update_mirror_worker.rb +++ b/app/workers/repository_update_mirror_worker.rb @@ -4,7 +4,8 @@ class UpdateMirrorError < StandardError; end include Sidekiq::Worker include Gitlab::ShellAdapter - sidekiq_options queue: :gitlab_shell + # Retry not neccessary. It will try again at the next update interval. + sidekiq_options queue: :gitlab_shell, retry: false attr_accessor :project, :repository, :current_user diff --git a/changelogs/unreleased-ee/sidekiq_set_retries.yml b/changelogs/unreleased-ee/sidekiq_set_retries.yml new file mode 100644 index 00000000000000..ec8f37d37f131e --- /dev/null +++ b/changelogs/unreleased-ee/sidekiq_set_retries.yml @@ -0,0 +1,4 @@ +--- +title: Disable retries for remote mirror update worker +merge_request: 848 +author: -- GitLab