summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYorick Peterse <yorickpeterse@gmail.com>2017-02-20 14:28:05 +0100
committerYorick Peterse <yorickpeterse@gmail.com>2017-02-20 14:29:01 +0100
commit4aaa85a6fdd7dc98356585ac77d4788fb8701ea1 (patch)
tree265c8e8f71fc7372f05ce760b33e984510525858
parentdc303fe2dbc422b71e61897443741f78f0138e82 (diff)
downloadgitlab-ce-sidekiq-transaction.tar.gz
Forbid Sidekiq scheduling in transactionssidekiq-transaction
Scheduling jobs in transactions can lead to race conditions where a job runs before a transaction has been committed. The added initializer ensures the various Sidekiq scheduling methods raise an error when called inside a transaction. Fixes #27233
-rw-r--r--config/initializers/forbid_sidekiq_in_transactions.rb15
1 files changed, 15 insertions, 0 deletions
diff --git a/config/initializers/forbid_sidekiq_in_transactions.rb b/config/initializers/forbid_sidekiq_in_transactions.rb
new file mode 100644
index 00000000000..0086dfe43a7
--- /dev/null
+++ b/config/initializers/forbid_sidekiq_in_transactions.rb
@@ -0,0 +1,15 @@
+mod = Module.new do
+ NESTING = ::Rails.env.test? ? 1 : 0
+
+ [:perform_async, :perform_at, :perform_in].each do |name|
+ define_method(name) do |*args|
+ if ActiveRecord::Base.connection.open_transactions > NESTING
+ raise "#{self}.#{name} can not be called in a transaction as this can lead to race conditions"
+ end
+
+ super(*args)
+ end
+ end
+end
+
+Sidekiq::Worker::ClassMethods.prepend(mod)