Skip to content
代码片段 群组 项目
未验证 提交 1998d792 编辑于 作者: Stan Hu's avatar Stan Hu 提交者: GitLab
浏览文件

Merge branch 'delete-ff-gitlab_sidekiq_enable_semi_reliable_fetcher' into 'master'

Delete two Sidekiq reliable_fetcher flags

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/143970



Merged-by: default avatarStan Hu <stanhu@gmail.com>
Approved-by: default avatarSylvester Chin <schin@gitlab.com>
Co-authored-by: default avatarRémy Coutable <remy@rymai.me>
No related branches found
No related tags found
无相关合并请求
---
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
---
name: gitlab_sidekiq_reliable_fetcher
introduced_by_url:
rollout_issue_url:
milestone:
type: ops
group: group::scalability
default_enabled: true
......@@ -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!
......
......@@ -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! }
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册