diff --git a/config/feature_flags/gitlab_com_derisk/load_balancing_disconnect_without_verify.yml b/config/feature_flags/gitlab_com_derisk/load_balancing_disconnect_without_verify.yml deleted file mode 100644 index 379762f547d290c390651d37bea120f6ab67ed36..0000000000000000000000000000000000000000 --- a/config/feature_flags/gitlab_com_derisk/load_balancing_disconnect_without_verify.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- -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 diff --git a/lib/gitlab/database/load_balancing/host.rb b/lib/gitlab/database/load_balancing/host.rb index 0814e2b1172f91578ff780c9e6d8899a960bf620..22cdbd4c93284a872a616db1bb369e9d380dcdd9 100644 --- a/lib/gitlab/database/load_balancing/host.rb +++ b/lib/gitlab/database/load_balancing/host.rb @@ -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! diff --git a/spec/lib/gitlab/database/load_balancing/host_spec.rb b/spec/lib/gitlab/database/load_balancing/host_spec.rb index 08ea4c39b656ff9060abf4d88d7e5fcaf54789db..c93935c8f32a3adc1d129c9cc24ff78aa3ab3178 100644 --- a/spec/lib/gitlab/database/load_balancing/host_spec.rb +++ b/spec/lib/gitlab/database/load_balancing/host_spec.rb @@ -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! }