From a7f096ff08a992779de27e6bb15bca0e5f88f0d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Thu, 8 Feb 2024 08:54:59 +0100
Subject: [PATCH] Delete two Sidekiq reliable_fetcher flags
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Changelog: removed
Signed-off-by: Rémy Coutable <remy@rymai.me>
---
 ...b_sidekiq_enable_semi_reliable_fetcher.yml |  8 ----
 .../ops/gitlab_sidekiq_reliable_fetcher.yml   |  8 ----
 config/initializers/sidekiq.rb                | 19 ++-------
 spec/initializers/sidekiq_spec.rb             | 40 -------------------
 4 files changed, 3 insertions(+), 72 deletions(-)
 delete mode 100644 config/feature_flags/ops/gitlab_sidekiq_enable_semi_reliable_fetcher.yml
 delete mode 100644 config/feature_flags/ops/gitlab_sidekiq_reliable_fetcher.yml

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 4d6eedb840a18..0000000000000
--- 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 39da2dcfdba76..0000000000000
--- 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 9b7233dbd14e2..926972a9d41e2 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 fb1377244d207..4974f17a378bd 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! }
 
-- 
GitLab