diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-02-06 19:24:46 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-02-15 09:43:38 +0100 |
| commit | d55d2256e1e57f604cccdaec074a4238c3073e6c (patch) | |
| tree | c3fd21e826bc853cc4d552118a2141460b8bb2ea | |
| parent | feab7e35a70ba7d154987e35f6d8b80e0a5d14ba (diff) | |
| download | gitlab-ce-d55d2256e1e57f604cccdaec074a4238c3073e6c.tar.gz | |
Merge branch 'remove-sidekiq-backup-ar-threads' into 'master'
Don't use backup AR connections for Sidekiq
Closes #27713
See merge request !9001
| -rw-r--r-- | changelogs/unreleased/remove-sidekiq-backup-ar-threads.yml | 4 | ||||
| -rw-r--r-- | config/initializers/sidekiq.rb | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/changelogs/unreleased/remove-sidekiq-backup-ar-threads.yml b/changelogs/unreleased/remove-sidekiq-backup-ar-threads.yml new file mode 100644 index 00000000000..f42aa6fae79 --- /dev/null +++ b/changelogs/unreleased/remove-sidekiq-backup-ar-threads.yml @@ -0,0 +1,4 @@ +--- +title: Don't use backup Active Record connections for Sidekiq +merge_request: +author: diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb index fa318384405..0c4516b70f0 100644 --- a/config/initializers/sidekiq.rb +++ b/config/initializers/sidekiq.rb @@ -36,11 +36,9 @@ Sidekiq.configure_server do |config| Gitlab::SidekiqThrottler.execute! - # Database pool should be at least `sidekiq_concurrency` + 2 - # For more info, see: https://github.com/mperham/sidekiq/blob/master/4.0-Upgrade.md config = ActiveRecord::Base.configurations[Rails.env] || Rails.application.config.database_configuration[Rails.env] - config['pool'] = Sidekiq.options[:concurrency] + 2 + config['pool'] = Sidekiq.options[:concurrency] ActiveRecord::Base.establish_connection(config) Rails.logger.debug("Connection Pool size for Sidekiq Server is now: #{ActiveRecord::Base.connection.pool.instance_variable_get('@size')}") |