diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-10 21:10:58 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-10 21:10:58 +0300 |
| commit | 147194556a703a5851750cd30e23de55f803b42d (patch) | |
| tree | 5a3bbebeccfd74a153c77b972da47463bc519057 /lib/gitlab | |
| parent | 6a6824a5ce46273248944d1859591d3a811aa18e (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab')
| -rw-r--r-- | lib/gitlab/database/load_balancing/host.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab/database/load_balancing/primary_host.rb | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/lib/gitlab/database/load_balancing/host.rb b/lib/gitlab/database/load_balancing/host.rb index 670a373ded1..acd7df0a263 100644 --- a/lib/gitlab/database/load_balancing/host.rb +++ b/lib/gitlab/database/load_balancing/host.rb @@ -163,8 +163,6 @@ module Gitlab def primary_write_location load_balancer.primary_write_location - ensure - load_balancer.release_primary_connection end def database_replica_location diff --git a/lib/gitlab/database/load_balancing/primary_host.rb b/lib/gitlab/database/load_balancing/primary_host.rb index 795fa7c3909..e379652c260 100644 --- a/lib/gitlab/database/load_balancing/primary_host.rb +++ b/lib/gitlab/database/load_balancing/primary_host.rb @@ -16,7 +16,8 @@ module Gitlab end def release_connection - @load_balancer.release_primary_connection + # no-op as releasing primary connections isn't needed. + nil end def enable_query_cache! @@ -51,8 +52,6 @@ module Gitlab def primary_write_location @load_balancer.primary_write_location - ensure - @load_balancer.release_primary_connection end def database_replica_location |