diff options
Diffstat (limited to 'config/initializers/load_balancing.rb')
| -rw-r--r-- | config/initializers/load_balancing.rb | 30 |
1 files changed, 13 insertions, 17 deletions
diff --git a/config/initializers/load_balancing.rb b/config/initializers/load_balancing.rb index 7502a6299ae..f3c977893ba 100644 --- a/config/initializers/load_balancing.rb +++ b/config/initializers/load_balancing.rb @@ -1,25 +1,21 @@ # frozen_string_literal: true -# We need to run this initializer after migrations are done so it doesn't fail on CI +if Gitlab::Database::LoadBalancing.enable? + Gitlab::Database.disable_prepared_statements -Gitlab.ee do - if Gitlab::Database.cached_table_exists?('licenses') - if Gitlab::Database::LoadBalancing.enable? - Gitlab::Database.disable_prepared_statements - - Gitlab::Application.configure do |config| - config.middleware.use(Gitlab::Database::LoadBalancing::RackMiddleware) - end + Gitlab::Application.configure do |config| + config.middleware.use(Gitlab::Database::LoadBalancing::RackMiddleware) + end - Gitlab::Database::LoadBalancing.configure_proxy + Gitlab::Database::LoadBalancing.configure_proxy - # This needs to be executed after fork of clustered processes - Gitlab::Cluster::LifecycleEvents.on_worker_start do - # Service discovery must be started after configuring the proxy, as service - # discovery depends on this. - Gitlab::Database::LoadBalancing.start_service_discovery - end + # This needs to be executed after fork of clustered processes + Gitlab::Cluster::LifecycleEvents.on_worker_start do + # For Host-based LB, we need to re-connect as Rails discards connections on fork + Gitlab::Database::LoadBalancing.configure_proxy - end + # Service discovery must be started after configuring the proxy, as service + # discovery depends on this. + Gitlab::Database::LoadBalancing.start_service_discovery end end |