From d498ec98e0286efecd70040180c69c2002f9ed78 Mon Sep 17 00:00:00 2001 From: Drew Blessing Date: Fri, 4 Nov 2016 14:48:05 -0500 Subject: [PATCH] Set default Sidekiq retries to 3 By default, Sidekiq will retry 25 times with an exponential backoff. This may result in jobs retrying for up to 21 days. Most Sidekiq failures occur when attempting to connect to external services - Project service hooks, web hooks, mailers, mirror updates, etc. We should set a default retry of 3, and if that's not sufficient individual workers can override this in the worker class. --- changelogs/unreleased/sidekiq_default_retries.yml | 4 ++++ config/initializers/sidekiq.rb | 3 +++ 2 files changed, 7 insertions(+) create mode 100644 changelogs/unreleased/sidekiq_default_retries.yml diff --git a/changelogs/unreleased/sidekiq_default_retries.yml b/changelogs/unreleased/sidekiq_default_retries.yml new file mode 100644 index 000000000000..3df2a415dbcb --- /dev/null +++ b/changelogs/unreleased/sidekiq_default_retries.yml @@ -0,0 +1,4 @@ +--- +title: Set default Sidekiq retries to 3 +merge_request: 7294 +author: diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb index 0455a98dbfe9..023af2af23ca 100644 --- a/config/initializers/sidekiq.rb +++ b/config/initializers/sidekiq.rb @@ -2,6 +2,9 @@ redis_config_hash = Gitlab::Redis.params redis_config_hash[:namespace] = Gitlab::Redis::SIDEKIQ_NAMESPACE +# Default is to retry 25 times with exponential backoff. That's too much. +Sidekiq.default_worker_options = { retry: 3 } + Sidekiq.configure_server do |config| config.redis = redis_config_hash -- GitLab