diff --git a/config/feature_flags/ops/gitlab_sidekiq_enable_semi_reliable_fetcher.yml b/config/feature_flags/ops/gitlab_sidekiq_enable_semi_reliable_fetcher.yml deleted file mode 100644 index 4d6eedb840a18e7827fab3093111674af5dc0388..0000000000000000000000000000000000000000 --- a/config/feature_flags/ops/gitlab_sidekiq_enable_semi_reliable_fetcher.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: gitlab_sidekiq_enable_semi_reliable_fetcher -introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/23854 -rollout_issue_url: -milestone: '11.6' -type: ops -group: group::geo -default_enabled: true diff --git a/config/feature_flags/ops/gitlab_sidekiq_reliable_fetcher.yml b/config/feature_flags/ops/gitlab_sidekiq_reliable_fetcher.yml deleted file mode 100644 index 39da2dcfdba763377a1fe7fbb2fb9363fa11d7e2..0000000000000000000000000000000000000000 --- a/config/feature_flags/ops/gitlab_sidekiq_reliable_fetcher.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: gitlab_sidekiq_reliable_fetcher -introduced_by_url: -rollout_issue_url: -milestone: -type: ops -group: group::scalability -default_enabled: true diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb index 9b7233dbd14e2cf051b5fac14594cc5bc9fcfcc4..926972a9d41e24f9bd07c61b6a708ca9cb3bfce8 100644 --- a/config/initializers/sidekiq.rb +++ b/config/initializers/sidekiq.rb @@ -15,18 +15,6 @@ def load_cron_jobs! end end -def enable_reliable_fetch? - return true unless Feature::FlipperFeature.table_exists? - - Feature.enabled?(:gitlab_sidekiq_reliable_fetcher, type: :ops) -end - -def enable_semi_reliable_fetch_mode? - return true unless Feature::FlipperFeature.table_exists? - - Feature.enabled?(:gitlab_sidekiq_enable_semi_reliable_fetcher, type: :ops) -end - # Custom Queues configuration queues_config_hash = Gitlab::Redis::Queues.redis_client_params @@ -99,10 +87,9 @@ def enable_semi_reliable_fetch_mode? Gitlab::Cluster::LifecycleEvents.do_worker_stop end - if enable_reliable_fetch? - config[:semi_reliable_fetch] = enable_semi_reliable_fetch_mode? - Sidekiq::ReliableFetch.setup_reliable_fetch!(config) - end + config[:semi_reliable_fetch] = true # Default value is false + + Sidekiq::ReliableFetch.setup_reliable_fetch!(config) Gitlab::SidekiqVersioning.install! diff --git a/spec/initializers/sidekiq_spec.rb b/spec/initializers/sidekiq_spec.rb index fb1377244d207bef2327578032d89ed09050e4ee..4974f17a378bdfb27a643bcc847cf0c8992f0314 100644 --- a/spec/initializers/sidekiq_spec.rb +++ b/spec/initializers/sidekiq_spec.rb @@ -3,46 +3,6 @@ require 'spec_helper' RSpec.describe 'sidekiq', feature_category: :build do - describe 'enable_reliable_fetch?' do - subject { enable_reliable_fetch? } - - context 'when gitlab_sidekiq_reliable_fetcher is enabled' do - before do - stub_feature_flags(gitlab_sidekiq_reliable_fetcher: true) - end - - it { is_expected.to be_truthy } - end - - context 'when gitlab_sidekiq_reliable_fetcher is disabled' do - before do - stub_feature_flags(gitlab_sidekiq_reliable_fetcher: false) - end - - it { is_expected.to be_falsey } - end - end - - describe 'enable_semi_reliable_fetch_mode?' do - subject { enable_semi_reliable_fetch_mode? } - - context 'when gitlab_sidekiq_enable_semi_reliable_fetcher is enabled' do - before do - stub_feature_flags(gitlab_sidekiq_enable_semi_reliable_fetcher: true) - end - - it { is_expected.to be_truthy } - end - - context 'when gitlab_sidekiq_enable_semi_reliable_fetcher is disabled' do - before do - stub_feature_flags(gitlab_sidekiq_enable_semi_reliable_fetcher: false) - end - - it { is_expected.to be_falsey } - end - end - describe 'load_cron_jobs!' do subject { load_cron_jobs! }