diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-02 21:07:42 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-02 21:07:42 +0300 |
| commit | 7b52c7cb634ef7047d30b0337fe477bcdcedf41d (patch) | |
| tree | 374ca9e908204488422046f10e340d1500780362 /lib/gitlab/sidekiq_config | |
| parent | b375c6c05fbd03aea33a9ee9f82e678bdaa8c3cc (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/sidekiq_config')
| -rw-r--r-- | lib/gitlab/sidekiq_config/cli_methods.rb | 4 | ||||
| -rw-r--r-- | lib/gitlab/sidekiq_config/dummy_worker.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab/sidekiq_config/worker.rb | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/lib/gitlab/sidekiq_config/cli_methods.rb b/lib/gitlab/sidekiq_config/cli_methods.rb index c95ba6faf1e..c49432f0fc6 100644 --- a/lib/gitlab/sidekiq_config/cli_methods.rb +++ b/lib/gitlab/sidekiq_config/cli_methods.rb @@ -26,9 +26,9 @@ module Gitlab QUERY_PREDICATES = { feature_category: :to_sym, has_external_dependencies: lambda { |value| value == 'true' }, - latency_sensitive: lambda { |value| value == 'true' }, name: :to_s, - resource_boundary: :to_sym + resource_boundary: :to_sym, + urgency: :to_sym }.freeze QueryError = Class.new(StandardError) diff --git a/lib/gitlab/sidekiq_config/dummy_worker.rb b/lib/gitlab/sidekiq_config/dummy_worker.rb index c2c8354b662..bd205c81931 100644 --- a/lib/gitlab/sidekiq_config/dummy_worker.rb +++ b/lib/gitlab/sidekiq_config/dummy_worker.rb @@ -9,7 +9,7 @@ module Gitlab ATTRIBUTE_METHODS = { feature_category: :get_feature_category, has_external_dependencies: :worker_has_external_dependencies?, - latency_sensitive: :latency_sensitive_worker?, + urgency: :get_urgency, resource_boundary: :get_worker_resource_boundary, idempotent: :idempotent?, weight: :get_weight diff --git a/lib/gitlab/sidekiq_config/worker.rb b/lib/gitlab/sidekiq_config/worker.rb index 4046ef54383..ec7a82f6459 100644 --- a/lib/gitlab/sidekiq_config/worker.rb +++ b/lib/gitlab/sidekiq_config/worker.rb @@ -7,8 +7,8 @@ module Gitlab attr_reader :klass delegate :feature_category_not_owned?, :get_feature_category, - :get_weight, :get_worker_resource_boundary, :idempotent?, - :latency_sensitive_worker?, :queue, :queue_namespace, + :get_urgency, :get_weight, :get_worker_resource_boundary, + :idempotent?, :queue, :queue_namespace, :worker_has_external_dependencies?, to: :klass @@ -49,7 +49,7 @@ module Gitlab name: queue, feature_category: get_feature_category, has_external_dependencies: worker_has_external_dependencies?, - latency_sensitive: latency_sensitive_worker?, + urgency: get_urgency, resource_boundary: get_worker_resource_boundary, weight: get_weight, idempotent: idempotent? |