diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-24 21:09:18 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-24 21:09:18 +0300 |
| commit | 8015f09545c35b833f4955fc2e0b8f1a3214cbcb (patch) | |
| tree | e28c5add700b9f3d12eabe1361889545785b29d4 /lib/gitlab/database.rb | |
| parent | 8e1bb8745bafe36f273ce4a095c3576c38ceb8b4 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/database.rb')
| -rw-r--r-- | lib/gitlab/database.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/gitlab/database.rb b/lib/gitlab/database.rb index 909dfc4f92d..87ff2a53ac3 100644 --- a/lib/gitlab/database.rb +++ b/lib/gitlab/database.rb @@ -223,8 +223,11 @@ module Gitlab def self.db_config_for_connection(connection) return unless connection + # For a ConnectionProxy we want to avoid ambiguous db_config as it may + # sometimes default to replica so we always return the primary config + # instead. if connection.is_a?(::Gitlab::Database::LoadBalancing::ConnectionProxy) - return connection.load_balancer.configuration.primary_db_config + return connection.load_balancer.configuration.db_config end # During application init we might receive `NullPool` |