diff options
| author | Stan Hu <stanhu@gmail.com> | 2016-07-01 12:51:21 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2016-07-25 17:59:09 -0700 |
| commit | f4aac773894bb17f550fff8ee548f2a18cd18b64 (patch) | |
| tree | 14a44f8db624e6486318a387ddfbf9ee8cc9ce91 | |
| parent | 68162ba900f1b9003fa3d07613333f201be8154a (diff) | |
| download | gitlab-ce-f4aac773894bb17f550fff8ee548f2a18cd18b64.tar.gz | |
Add support for using RequestStore within Sidekiq tasks via SIDEKIQ_REQUEST_STORE env variable
This significantly reduces the DB churn in the PostReceive task when it
performs reference extraction.
See #18663
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | config/initializers/sidekiq.rb | 1 | ||||
| -rw-r--r-- | lib/gitlab/sidekiq_middleware/request_store_middleware.rb | 13 |
3 files changed, 15 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index 534f57cb08e..0b796cc66a1 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -4,6 +4,7 @@ v 8.11.0 (unreleased) - Remove magic comments (`# encoding: UTF-8`) from Ruby files !5456 (winniehell) - Fix CI status icon link underline (ClemMakesApps) - Fix of 'Commits being passed to custom hooks are already reachable when using the UI' + - Add support for using RequestStore within Sidekiq tasks via SIDEKIQ_REQUEST_STORE env variable - Limit git rev-list output count to one in forced push check - Add green outline to New Branch button !5447 (winniehell) - Retrieve rendered HTML from cache in one request diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb index 5e839327e7a..48b6075ba78 100644 --- a/config/initializers/sidekiq.rb +++ b/config/initializers/sidekiq.rb @@ -7,6 +7,7 @@ Sidekiq.configure_server do |config| config.server_middleware do |chain| chain.add Gitlab::SidekiqMiddleware::ArgumentsLogger if ENV['SIDEKIQ_LOG_ARGUMENTS'] chain.add Gitlab::SidekiqMiddleware::MemoryKiller if ENV['SIDEKIQ_MEMORY_KILLER_MAX_RSS'] + chain.add Gitlab::SidekiqMiddleware::RequestStoreMiddleware if ENV['SIDEKIQ_REQUEST_STORE'] end # Sidekiq-cron: load recurring jobs from gitlab.yml diff --git a/lib/gitlab/sidekiq_middleware/request_store_middleware.rb b/lib/gitlab/sidekiq_middleware/request_store_middleware.rb new file mode 100644 index 00000000000..b1fa0e3cb4e --- /dev/null +++ b/lib/gitlab/sidekiq_middleware/request_store_middleware.rb @@ -0,0 +1,13 @@ +module Gitlab + module SidekiqMiddleware + class RequestStoreMiddleware + def call(worker, job, queue) + RequestStore.begin! + yield + ensure + RequestStore.end! + RequestStore.clear! + end + end + end +end |