diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 14:18:50 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 14:18:50 +0300 |
commit | 8c7f4e9d5f36cff46365a7f8c4b9c21578c1e781 (patch) | |
tree | a77e7fe7a93de11213032ed4ab1f33a3db51b738 /lib/gitlab/sidekiq_config | |
parent | 00b35af3db1abfe813a778f643dad221aad51fca (diff) |
Add latest changes from gitlab-org/gitlab@13-1-stable-ee
Diffstat (limited to 'lib/gitlab/sidekiq_config')
-rw-r--r-- | lib/gitlab/sidekiq_config/cli_methods.rb | 7 | ||||
-rw-r--r-- | lib/gitlab/sidekiq_config/dummy_worker.rb | 3 | ||||
-rw-r--r-- | lib/gitlab/sidekiq_config/worker.rb | 5 |
3 files changed, 11 insertions, 4 deletions
diff --git a/lib/gitlab/sidekiq_config/cli_methods.rb b/lib/gitlab/sidekiq_config/cli_methods.rb index 0d0efe8ffbd..a256632bc12 100644 --- a/lib/gitlab/sidekiq_config/cli_methods.rb +++ b/lib/gitlab/sidekiq_config/cli_methods.rb @@ -28,6 +28,7 @@ module Gitlab has_external_dependencies: lambda { |value| value == 'true' }, name: :to_s, resource_boundary: :to_sym, + tags: :to_sym, urgency: :to_sym }.freeze @@ -117,7 +118,11 @@ module Gitlab raise UnknownPredicate.new("Unknown predicate: #{lhs}") unless values_block - lambda { |queue| values.map(&values_block).include?(queue[lhs.to_sym]) } + lambda do |queue| + comparator = Array(queue[lhs.to_sym]).to_set + + values.map(&values_block).to_set.intersect?(comparator) + end end end end diff --git a/lib/gitlab/sidekiq_config/dummy_worker.rb b/lib/gitlab/sidekiq_config/dummy_worker.rb index bd205c81931..7568840410b 100644 --- a/lib/gitlab/sidekiq_config/dummy_worker.rb +++ b/lib/gitlab/sidekiq_config/dummy_worker.rb @@ -12,7 +12,8 @@ module Gitlab urgency: :get_urgency, resource_boundary: :get_worker_resource_boundary, idempotent: :idempotent?, - weight: :get_weight + weight: :get_weight, + tags: :get_tags }.freeze def initialize(queue, attributes = {}) diff --git a/lib/gitlab/sidekiq_config/worker.rb b/lib/gitlab/sidekiq_config/worker.rb index ec7a82f6459..46fa0aa5be1 100644 --- a/lib/gitlab/sidekiq_config/worker.rb +++ b/lib/gitlab/sidekiq_config/worker.rb @@ -6,7 +6,7 @@ module Gitlab include Comparable attr_reader :klass - delegate :feature_category_not_owned?, :get_feature_category, + delegate :feature_category_not_owned?, :get_feature_category, :get_tags, :get_urgency, :get_weight, :get_worker_resource_boundary, :idempotent?, :queue, :queue_namespace, :worker_has_external_dependencies?, @@ -52,7 +52,8 @@ module Gitlab urgency: get_urgency, resource_boundary: get_worker_resource_boundary, weight: get_weight, - idempotent: idempotent? + idempotent: idempotent?, + tags: get_tags } end |