Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42

1 files changed, 2 insertions, 12 deletions

diff --git a/config/initializers/database_config.rb b/config/initializers/database_config.rb
index a91f67224d7..6637080c038 100644
--- a/config/initializers/database_config.rb
+++ b/config/initializers/database_config.rb
@@ -20,25 +20,15 @@ Gitlab.ee do
   end
 end
 
-# We configure the database connection pool size automatically based on the
-# configured concurrency. We also add some headroom, to make sure we don't run
-# out of connections when more threads besides the 'user-facing' ones are
-# running.
-#
-# Read more about this in doc/development/database/client_side_connection_pool.md
-
-headroom = (ENV["DB_POOL_HEADROOM"].presence || 10).to_i
-calculated_pool_size = Gitlab::Runtime.max_threads + headroom
-
 db_config = Gitlab::Database.config ||
             Rails.application.config.database_configuration[Rails.env]
 
-db_config['pool'] = calculated_pool_size
+db_config['pool'] = Gitlab::Database.default_pool_size
 ActiveRecord::Base.establish_connection(db_config)
 
 Gitlab.ee do
   if Gitlab::Runtime.sidekiq? && Gitlab::Geo.geo_database_configured?
-    Rails.configuration.geo_database['pool'] = calculated_pool_size
+    Rails.configuration.geo_database['pool'] = Gitlab::Database.default_pool_size
     Geo::TrackingBase.establish_connection(Rails.configuration.geo_database)
   end
 end