diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-11-22 18:04:34 +0000 |
|---|---|---|
| committer | Steve Azzopardi <steveazz@outlook.com> | 2018-11-30 10:38:04 +0100 |
| commit | 49ddc2edde6331f6a144827808ccf3808f247aae (patch) | |
| tree | e39b4926bedfb383bfa45f1303a64d8457780f80 | |
| parent | 103d453a00bff872e018696e5f690b52b15510ea (diff) | |
| download | gitlab-ce-49ddc2edde6331f6a144827808ccf3808f247aae.tar.gz | |
Merge branch 'dm-batch-loader-sidekiq' into 'master'
Clear BatchLoader context between Sidekiq jobs
Closes #53079
See merge request gitlab-org/gitlab-ce!23308
| -rw-r--r-- | changelogs/unreleased/dm-batch-loader-sidekiq.yml | 5 | ||||
| -rw-r--r-- | config/initializers/sidekiq.rb | 1 | ||||
| -rw-r--r-- | lib/gitlab/sidekiq_middleware/batch_loader.rb | 13 |
3 files changed, 19 insertions, 0 deletions
diff --git a/changelogs/unreleased/dm-batch-loader-sidekiq.yml b/changelogs/unreleased/dm-batch-loader-sidekiq.yml new file mode 100644 index 00000000000..87936dc2603 --- /dev/null +++ b/changelogs/unreleased/dm-batch-loader-sidekiq.yml @@ -0,0 +1,5 @@ +--- +title: Clear BatchLoader context between Sidekiq jobs +merge_request: 23308 +author: +type: fixed diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb index 565efc858d1..4210be2c701 100644 --- a/config/initializers/sidekiq.rb +++ b/config/initializers/sidekiq.rb @@ -20,6 +20,7 @@ Sidekiq.configure_server do |config| chain.add Gitlab::SidekiqMiddleware::ArgumentsLogger if ENV['SIDEKIQ_LOG_ARGUMENTS'] && !enable_json_logs chain.add Gitlab::SidekiqMiddleware::Shutdown chain.add Gitlab::SidekiqMiddleware::RequestStoreMiddleware unless ENV['SIDEKIQ_REQUEST_STORE'] == '0' + chain.add Gitlab::SidekiqMiddleware::BatchLoader chain.add Gitlab::SidekiqStatus::ServerMiddleware end diff --git a/lib/gitlab/sidekiq_middleware/batch_loader.rb b/lib/gitlab/sidekiq_middleware/batch_loader.rb new file mode 100644 index 00000000000..75c4efc3042 --- /dev/null +++ b/lib/gitlab/sidekiq_middleware/batch_loader.rb @@ -0,0 +1,13 @@ +# frozen_string_literal: true + +module Gitlab + module SidekiqMiddleware + class BatchLoader + def call(worker, job, queue) + yield + ensure + ::BatchLoader::Executor.clear_current + end + end + end +end |