diff options
author | Valery Sizov <valery@gitlab.com> | 2019-04-20 17:40:43 +0300 |
---|---|---|
committer | Valery Sizov <valery@gitlab.com> | 2019-04-25 12:36:20 +0300 |
commit | 0494242c4f37b37c9b78c810dfa461eb76d374c4 (patch) | |
tree | a9d29548c184469b900cbc5199b721963645acfe | |
parent | e7c494cc08de77a8898a561016bd38abc903a5d8 (diff) | |
download | gitlab-ce-10327-enable-reliable-fetcher-by-default.tar.gz |
Enable Reliable fetcher by default10327-enable-reliable-fetcher-by-default
-rw-r--r-- | changelogs/unreleased/10327-enable-reliable-fetcher-by-default.yml | 5 | ||||
-rw-r--r-- | config/initializers/sidekiq.rb | 17 |
2 files changed, 19 insertions, 3 deletions
diff --git a/changelogs/unreleased/10327-enable-reliable-fetcher-by-default.yml b/changelogs/unreleased/10327-enable-reliable-fetcher-by-default.yml new file mode 100644 index 00000000000..e3834688ae2 --- /dev/null +++ b/changelogs/unreleased/10327-enable-reliable-fetcher-by-default.yml @@ -0,0 +1,5 @@ +--- +title: Enable Reliable Fetcher for background jobs +merge_request: 27530 +author: +type: added diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb index 2e4aa9c1053..19ff36d217f 100644 --- a/config/initializers/sidekiq.rb +++ b/config/initializers/sidekiq.rb @@ -45,9 +45,8 @@ Sidekiq.configure_server do |config| ActiveRecord::Base.clear_all_connections! end - if Feature::FlipperFeature.table_exists? && Feature.enabled?(:gitlab_sidekiq_reliable_fetcher) - # By default we're going to use Semi Reliable Fetch - config.options[:semi_reliable_fetch] = Feature.enabled?(:gitlab_sidekiq_enable_semi_reliable_fetcher, default_enabled: true) + if enable_reliable_fetch? + config.options[:semi_reliable_fetch] = enable_semi_reliable_fetch_mode? Sidekiq::ReliableFetch.setup_reliable_fetch!(config) end @@ -90,3 +89,15 @@ Sidekiq.configure_client do |config| chain.add Gitlab::SidekiqStatus::ClientMiddleware end end + +def enable_reliable_fetch? + return true unless Feature::FlipperFeature.table_exists? + + Feature.enabled?(:gitlab_sidekiq_reliable_fetcher, default_enabled: true) +end + +def enable_semi_reliable_fetch_mode? + return true unless Feature::FlipperFeature.table_exists? + + Feature.enabled?(:gitlab_sidekiq_enable_semi_reliable_fetcher, default_enabled: true) +end |