Commit 3d1fa790 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'sidekiq-query' into 'master'

Disable query limit counter in sidekiq

See merge request gitlab-org/gitlab-ce!21470
parents cee47fb3 39743eaf
require 'sidekiq/testing/inline' require 'sidekiq/testing/inline'
# If Sidekiq::Testing.inline! is used, SQL transactions done inside
# Sidekiq worker are included in the SQL query limit (in a real
# deployment sidekiq worker is executed separately). To avoid
# increasing SQL limit counter, the request is marked as whitelisted
# during Sidekiq block
class DisableQueryLimit
def call(worker_instance, msg, queue)
transaction = Gitlab::QueryLimiting::Transaction.current
if !transaction.respond_to?(:whitelisted) || transaction.whitelisted
yield
else
transaction.whitelisted = true
yield
transaction.whitelisted = false
end
end
end
Sidekiq::Testing.server_middleware do |chain| Sidekiq::Testing.server_middleware do |chain|
chain.add Gitlab::SidekiqStatus::ServerMiddleware chain.add Gitlab::SidekiqStatus::ServerMiddleware
chain.add DisableQueryLimit
end end
RSpec.configure do |config| RSpec.configure do |config|
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment