diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 11:18:50 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 11:18:50 +0000 |
commit | 8c7f4e9d5f36cff46365a7f8c4b9c21578c1e781 (patch) | |
tree | a77e7fe7a93de11213032ed4ab1f33a3db51b738 /spec/lib/gitlab/sidekiq_config | |
parent | 00b35af3db1abfe813a778f643dad221aad51fca (diff) | |
download | gitlab-ce-8c7f4e9d5f36cff46365a7f8c4b9c21578c1e781.tar.gz |
Add latest changes from gitlab-org/gitlab@13-1-stable-ee
Diffstat (limited to 'spec/lib/gitlab/sidekiq_config')
-rw-r--r-- | spec/lib/gitlab/sidekiq_config/cli_methods_spec.rb | 45 | ||||
-rw-r--r-- | spec/lib/gitlab/sidekiq_config/worker_spec.rb | 9 |
2 files changed, 44 insertions, 10 deletions
diff --git a/spec/lib/gitlab/sidekiq_config/cli_methods_spec.rb b/spec/lib/gitlab/sidekiq_config/cli_methods_spec.rb index 80e8da58f23..7a8aba2d396 100644 --- a/spec/lib/gitlab/sidekiq_config/cli_methods_spec.rb +++ b/spec/lib/gitlab/sidekiq_config/cli_methods_spec.rb @@ -76,7 +76,12 @@ describe Gitlab::SidekiqConfig::CliMethods do describe '.expand_queues' do let(:worker_queues) do - ['cronjob:stuck_import_jobs', 'cronjob:stuck_merge_jobs', 'post_receive'] + [ + 'cronjob:import_stuck_project_import_jobs', + 'cronjob:jira_import_stuck_jira_import_jobs', + 'cronjob:stuck_merge_jobs', + 'post_receive' + ] end it 'defaults the value of the second argument to .worker_queues' do @@ -88,12 +93,22 @@ describe Gitlab::SidekiqConfig::CliMethods do allow(described_class).to receive(:worker_queues).and_return(worker_queues) expect(described_class.expand_queues(['cronjob'])) - .to contain_exactly('cronjob', 'cronjob:stuck_import_jobs', 'cronjob:stuck_merge_jobs') + .to contain_exactly( + 'cronjob', + 'cronjob:import_stuck_project_import_jobs', + 'cronjob:jira_import_stuck_jira_import_jobs', + 'cronjob:stuck_merge_jobs' + ) end it 'expands queue namespaces to concrete queue names' do expect(described_class.expand_queues(['cronjob'], worker_queues)) - .to contain_exactly('cronjob', 'cronjob:stuck_import_jobs', 'cronjob:stuck_merge_jobs') + .to contain_exactly( + 'cronjob', + 'cronjob:import_stuck_project_import_jobs', + 'cronjob:jira_import_stuck_jira_import_jobs', + 'cronjob:stuck_merge_jobs' + ) end it 'lets concrete queue names pass through' do @@ -117,28 +132,32 @@ describe Gitlab::SidekiqConfig::CliMethods do feature_category: :category_a, has_external_dependencies: false, urgency: :low, - resource_boundary: :cpu + resource_boundary: :cpu, + tags: [:no_disk_io, :git_access] }, { name: 'a:2', feature_category: :category_a, has_external_dependencies: false, urgency: :high, - resource_boundary: :none + resource_boundary: :none, + tags: [:git_access] }, { name: 'b', feature_category: :category_b, has_external_dependencies: true, urgency: :high, - resource_boundary: :memory + resource_boundary: :memory, + tags: [:no_disk_io] }, { name: 'c', feature_category: :category_c, has_external_dependencies: false, urgency: :throttled, - resource_boundary: :memory + resource_boundary: :memory, + tags: [] } ] end @@ -177,6 +196,18 @@ describe Gitlab::SidekiqConfig::CliMethods do 'resource_boundary=memory|resource_boundary=cpu' | %w(a b c) 'resource_boundary!=memory,cpu' | %w(a:2) + # tags + 'tags=no_disk_io' | %w(a b) + 'tags=no_disk_io,git_access' | %w(a a:2 b) + 'tags=no_disk_io|tags=git_access' | %w(a a:2 b) + 'tags=no_disk_io&tags=git_access' | %w(a) + 'tags!=no_disk_io' | %w(a:2 c) + 'tags!=no_disk_io,git_access' | %w(c) + 'tags=unknown_tag' | [] + 'tags!=no_disk_io' | %w(a:2 c) + 'tags!=no_disk_io,git_access' | %w(c) + 'tags!=unknown_tag' | %w(a a:2 b c) + # combinations 'feature_category=category_a&urgency=high' | %w(a:2) 'feature_category=category_a&urgency=high|feature_category=category_c' | %w(a:2 c) diff --git a/spec/lib/gitlab/sidekiq_config/worker_spec.rb b/spec/lib/gitlab/sidekiq_config/worker_spec.rb index 817755e3507..00343a0264d 100644 --- a/spec/lib/gitlab/sidekiq_config/worker_spec.rb +++ b/spec/lib/gitlab/sidekiq_config/worker_spec.rb @@ -13,7 +13,8 @@ describe Gitlab::SidekiqConfig::Worker do get_worker_resource_boundary: attributes[:resource_boundary], get_urgency: attributes[:urgency], worker_has_external_dependencies?: attributes[:has_external_dependencies], - idempotent?: attributes[:idempotent] + idempotent?: attributes[:idempotent], + get_tags: attributes[:tags] ) described_class.new(inner_worker, ee: false) @@ -91,7 +92,8 @@ describe Gitlab::SidekiqConfig::Worker do urgency: :low, resource_boundary: :memory, weight: 2, - idempotent: true + idempotent: true, + tags: [] } attributes_b = { @@ -100,7 +102,8 @@ describe Gitlab::SidekiqConfig::Worker do urgency: :high, resource_boundary: :unknown, weight: 3, - idempotent: false + idempotent: false, + tags: [:no_disk_io] } worker_a = create_worker(queue: 'a', **attributes_a) |