Skip to content
代码片段 群组 项目
未验证 提交 b7b5a0e2 编辑于 作者: Bob Van Landuyt's avatar Bob Van Landuyt 提交者: GitLab
浏览文件

Merge branch 'sh-drop-load-balancing-disconnect-without-verify-ff' into 'master'

Remove load_balancing_disconnect_without_verify feature flag

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



Merged-by: default avatarBob Van Landuyt <bob@gitlab.com>
Approved-by: default avatarAdam Hegyi <ahegyi@gitlab.com>
Approved-by: default avatarBob Van Landuyt <bob@gitlab.com>
Co-authored-by: default avatarStan Hu <stanhu@gmail.com>
No related branches found
No related tags found
无相关合并请求
---
name: load_balancing_disconnect_without_verify
feature_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/490211
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/166231
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/490104
milestone: '17.5'
group: infrastructure
type: gitlab_com_derisk
default_enabled: false
......@@ -112,9 +112,8 @@ def force_disconnect!
def pool_disconnect!
return pool.disconnect! if ::Gitlab.next_rails?
return pool.disconnect_without_verify! if Feature.enabled?(:load_balancing_disconnect_without_verify)
pool.disconnect!
pool.disconnect_without_verify!
end
def offline!
......
......@@ -87,16 +87,6 @@ def expect_next_replica_connection
if ::Gitlab.next_rails?
it_behaves_like 'disconnects the pool'
else
context 'with load_balancing_disconnect_without_verify feature flag disabled' do
let(:disconnect_method) { :disconnect! }
before do
stub_feature_flags(load_balancing_disconnect_without_verify: false)
end
it_behaves_like 'disconnects the pool'
end
context 'with load_balancing_disconnect_without_verify feature flag enabled' do
let(:disconnect_method) { :disconnect_without_verify! }
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册