From 1b8a791829a3c6226f5185f2433ddf632d2d945d Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@selenight.nl>
Date: Thu, 22 Nov 2018 17:28:09 +0100
Subject: Clear BatchLoader context between Sidekiq jobs

---
 lib/gitlab/sidekiq_middleware/batch_loader.rb | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 lib/gitlab/sidekiq_middleware/batch_loader.rb

(limited to 'lib')

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
-- 
cgit v1.2.1