diff --git a/ee/app/models/geo/tracking_base.rb b/ee/app/models/geo/tracking_base.rb index 9e925c372372cb7f9a56b6a7624fd4b252212c89..3504ec3c8906c1012bee94043ade9270627d7f1e 100644 --- a/ee/app/models/geo/tracking_base.rb +++ b/ee/app/models/geo/tracking_base.rb @@ -15,7 +15,8 @@ module Geo raise SecondaryNotConfigured.new('Geo secondary database is not configured') end - super + # Don't call super because LoadBalancing::ActiveRecordProxy will intercept it + retrieve_connection end end end diff --git a/ee/changelogs/unreleased/sh-fix-geo-load-balancing.yml b/ee/changelogs/unreleased/sh-fix-geo-load-balancing.yml new file mode 100644 index 0000000000000000000000000000000000000000..3ba02286a6425b1e686b177b4cd248690b65954e --- /dev/null +++ b/ee/changelogs/unreleased/sh-fix-geo-load-balancing.yml @@ -0,0 +1,5 @@ +--- +title: Geo: Fix load balancing configuration not working with Geo tracking database +merge_request: 6178 +author: +type: fixed