diff options
| author | Yorick Peterse <yorickpeterse@gmail.com> | 2016-09-20 11:56:40 +0000 |
|---|---|---|
| committer | Ruben Davila <rdavila84@gmail.com> | 2016-09-20 11:00:10 -0500 |
| commit | 385f01f38846aa8ef26316983fdfb54c16da3dee (patch) | |
| tree | 0aec96fb84bb23737cf07f0c7e1b90b1a7cdb3e9 /config | |
| parent | 9c4cb45b0f6e9586d967c9da32f145449c2949e1 (diff) | |
| download | gitlab-ce-385f01f38846aa8ef26316983fdfb54c16da3dee.tar.gz | |
Merge branch '22364-rails-cache-redis-connection-pool' into 'master'
Use a ConnectionPool for Rails.cache on Sidekiq servers
See merge request !6429
Diffstat (limited to 'config')
| -rw-r--r-- | config/application.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/config/application.rb b/config/application.rb index 4792f6670a8..8166b6003f6 100644 --- a/config/application.rb +++ b/config/application.rb @@ -116,6 +116,10 @@ module Gitlab redis_config_hash = Gitlab::Redis.params redis_config_hash[:namespace] = Gitlab::Redis::CACHE_NAMESPACE redis_config_hash[:expires_in] = 2.weeks # Cache should not grow forever + if Sidekiq.server? # threaded context + redis_config_hash[:pool_size] = Sidekiq.options[:concurrency] + 5 + redis_config_hash[:pool_timeout] = 1 + end config.cache_store = :redis_store, redis_config_hash config.active_record.raise_in_transactional_callbacks = true |