Merge branch '29137-bulk-perform-async-should-specify-queue' into 'master'
adds queue option to push bulk in authorized projects worker Closes #29137 See merge request !9813
This commit is contained in:
commit
c8bbf9a896
3 changed files with 25 additions and 6 deletions
|
@ -10,7 +10,7 @@ class AuthorizedProjectsWorker
|
|||
end
|
||||
|
||||
def self.bulk_perform_async(args_list)
|
||||
Sidekiq::Client.push_bulk('class' => self, 'args' => args_list)
|
||||
Sidekiq::Client.push_bulk('class' => self, 'queue' => sidekiq_options['queue'], 'args' => args_list)
|
||||
end
|
||||
|
||||
def perform(user_id)
|
||||
|
|
|
@ -0,0 +1,4 @@
|
|||
---
|
||||
title: Make authorized projects worker use a specific queue instead of the default one
|
||||
merge_request: 9813
|
||||
author:
|
|
@ -1,12 +1,10 @@
|
|||
require 'spec_helper'
|
||||
|
||||
describe AuthorizedProjectsWorker do
|
||||
let(:worker) { described_class.new }
|
||||
let(:project) { create(:empty_project) }
|
||||
|
||||
describe '.bulk_perform_and_wait' do
|
||||
it 'schedules the ids and waits for the jobs to complete' do
|
||||
project = create(:project)
|
||||
|
||||
project.owner.project_authorizations.delete_all
|
||||
|
||||
described_class.bulk_perform_and_wait([[project.owner.id]])
|
||||
|
@ -15,20 +13,37 @@ describe AuthorizedProjectsWorker do
|
|||
end
|
||||
end
|
||||
|
||||
describe '.bulk_perform_async' do
|
||||
it "uses it's respective sidekiq queue" do
|
||||
args = [[project.owner.id]]
|
||||
push_bulk_args = {
|
||||
'class' => described_class,
|
||||
'queue' => described_class.sidekiq_options['queue'],
|
||||
'args' => args
|
||||
}
|
||||
|
||||
expect(Sidekiq::Client).to receive(:push_bulk).with(push_bulk_args).once
|
||||
|
||||
described_class.bulk_perform_async(args)
|
||||
end
|
||||
end
|
||||
|
||||
describe '#perform' do
|
||||
subject { described_class.new }
|
||||
|
||||
it "refreshes user's authorized projects" do
|
||||
user = create(:user)
|
||||
|
||||
expect_any_instance_of(User).to receive(:refresh_authorized_projects)
|
||||
|
||||
worker.perform(user.id)
|
||||
subject.perform(user.id)
|
||||
end
|
||||
|
||||
context "when the user is not found" do
|
||||
it "does nothing" do
|
||||
expect_any_instance_of(User).not_to receive(:refresh_authorized_projects)
|
||||
|
||||
described_class.new.perform(-1)
|
||||
subject.perform(-1)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue