Commit 26a50a0c authored by charlie ablett's avatar charlie ablett

Merge branch 'jivanvl-remove-ci-runner-builds-queue-on-replicas-ff' into 'master'

Enable builds queue on replicas by default [RUN ALL RSPEC] [RUN AS-IF-FOSS]

See merge request gitlab-org/gitlab!62619
parents 33c56a50 2a7b20d0
---
name: ci_runner_builds_queue_on_replicas
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56849
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/325723
milestone: '13.10'
type: development
group: group::continuous integration
default_enabled: true
...@@ -18,8 +18,6 @@ module EE ...@@ -18,8 +18,6 @@ module EE
end end
def heartbeat(values) def heartbeat(values)
return super unless ::Feature.enabled?(:ci_runner_builds_queue_on_replicas, self, default_enabled: :yaml)
## ##
# We can safely ignore writes performed by a runner heartbeat. We do # We can safely ignore writes performed by a runner heartbeat. We do
# not want to upgrade database connection proxy to use the primary # not want to upgrade database connection proxy to use the primary
......
...@@ -29,13 +29,11 @@ module EE ...@@ -29,13 +29,11 @@ module EE
end end
def retrieve_queue(queue_query_proc) def retrieve_queue(queue_query_proc)
if ::Feature.enabled?(:ci_runner_builds_queue_on_replicas, runner, default_enabled: :yaml) ##
## # We want to reset a load balancing session to discard the side
# We want to reset a load balancing session to discard the side # effects of writes that could have happened prior to this moment.
# effects of writes that could have happened prior to this moment. #
# ::Gitlab::Database::LoadBalancing::Session.clear_session
::Gitlab::Database::LoadBalancing::Session.clear_session
end
super super
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment