Merge branch 'sh-fix-geo-load-balancing' into 'master'

Fix load balancing configuration not working with Geo tracking database

Closes #6480

See merge request gitlab-org/gitlab-ee!6178

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

ee/changelogs/unreleased/sh-fix-geo-load-balancing.yml

+---
+title: Geo: Fix load balancing configuration not working with Geo tracking database
+merge_request: 6178
+author:
+type: fixed