Merge branch 'ecosystem-urgency-worker' into 'master'

Add Ecosystem urgency workers See merge request gitlab-org/gitlab!66658

Merge branch 'ecosystem-urgency-worker' into 'master'
Add Ecosystem urgency workers See merge request gitlab-org/gitlab!66658
b8419272 · Alex Kalderimis · 5ba5f159 · 6cdcb057 · b8419272 · b8419272
Commit b8419272 authored Jul 26, 2021 by Alex Kalderimis
19 changed files
--- a/app/workers/file_hook_worker.rb
+++ b/app/workers/file_hook_worker.rb
@@ -4,10 +4,10 @@ class FileHookWorker # rubocop:disable Scalability/IdempotentWorker
  include ApplicationWorker

  data_consistency :always
-
  sidekiq_options retry: false
  feature_category :integrations
  loggable_arguments 0
+  urgency :low

  def perform(file_name, data)
    success, message = Gitlab::FileHook.execute(file_name, data)

--- a/app/workers/irker_worker.rb
+++ b/app/workers/irker_worker.rb
@@ -7,10 +7,9 @@ class IrkerWorker # rubocop:disable Scalability/IdempotentWorker
  include ApplicationWorker

  data_consistency :always
-
  sidekiq_options retry: 3
-
  feature_category :integrations
+  urgency :low

  def perform(project_id, channels, colors, push_data, settings)
    # Establish connection to irker server

--- a/app/workers/jira_connect/forward_event_worker.rb
+++ b/app/workers/jira_connect/forward_event_worker.rb
@@ -5,9 +5,10 @@ module JiraConnect
    include ApplicationWorker

    data_consistency :always
-
    queue_namespace :jira_connect
    feature_category :integrations
+    urgency :low
+
    worker_has_external_dependencies!

    def perform(installation_id, base_path, event_path)

--- a/app/workers/jira_connect/sync_branch_worker.rb
+++ b/app/workers/jira_connect/sync_branch_worker.rb
@@ -5,11 +5,11 @@ module JiraConnect
    include ApplicationWorker

    sidekiq_options retry: 3
-
    queue_namespace :jira_connect
    feature_category :integrations
    data_consistency :delayed
    loggable_arguments 1, 2
+    urgency :low

    worker_has_external_dependencies!


--- a/app/workers/jira_connect/sync_builds_worker.rb
+++ b/app/workers/jira_connect/sync_builds_worker.rb
@@ -5,11 +5,11 @@ module JiraConnect
    include ApplicationWorker

    sidekiq_options retry: 3
-
    queue_namespace :jira_connect
    feature_category :integrations
    data_consistency :delayed
    tags :exclude_from_kubernetes
+    urgency :low

    worker_has_external_dependencies!


--- a/app/workers/jira_connect/sync_deployments_worker.rb
+++ b/app/workers/jira_connect/sync_deployments_worker.rb
@@ -5,11 +5,11 @@ module JiraConnect
    include ApplicationWorker

    sidekiq_options retry: 3
-
    queue_namespace :jira_connect
    feature_category :integrations
    data_consistency :delayed
    tags :exclude_from_kubernetes
+    urgency :low

    worker_has_external_dependencies!


--- a/app/workers/jira_connect/sync_feature_flags_worker.rb
+++ b/app/workers/jira_connect/sync_feature_flags_worker.rb
@@ -5,11 +5,11 @@ module JiraConnect
    include ApplicationWorker

    sidekiq_options retry: 3
-
    queue_namespace :jira_connect
    feature_category :integrations
    data_consistency :delayed
    tags :exclude_from_kubernetes
+    urgency :low

    worker_has_external_dependencies!


--- a/app/workers/jira_connect/sync_merge_request_worker.rb
+++ b/app/workers/jira_connect/sync_merge_request_worker.rb
@@ -5,10 +5,10 @@ module JiraConnect
    include ApplicationWorker

    sidekiq_options retry: 3
-
    queue_namespace :jira_connect
    feature_category :integrations
    data_consistency :delayed
+    urgency :low

    worker_has_external_dependencies!


--- a/app/workers/jira_connect/sync_project_worker.rb
+++ b/app/workers/jira_connect/sync_project_worker.rb
@@ -5,11 +5,11 @@ module JiraConnect
    include ApplicationWorker

    sidekiq_options retry: 3
-
    queue_namespace :jira_connect
    feature_category :integrations
    data_consistency :delayed
    tags :exclude_from_kubernetes
+    urgency :low

    worker_has_external_dependencies!


--- a/app/workers/project_service_worker.rb
+++ b/app/workers/project_service_worker.rb
@@ -4,11 +4,11 @@ class ProjectServiceWorker # rubocop:disable Scalability/IdempotentWorker
  include ApplicationWorker

  data_consistency :always
-
  sidekiq_options retry: 3
-
  sidekiq_options dead: false
  feature_category :integrations
+  urgency :low
+
  worker_has_external_dependencies!

  def perform(hook_id, data)

--- a/app/workers/propagate_integration_group_worker.rb
+++ b/app/workers/propagate_integration_group_worker.rb
@@ -4,11 +4,11 @@ class PropagateIntegrationGroupWorker
  include ApplicationWorker

  data_consistency :always
-
  sidekiq_options retry: 3
-
  feature_category :integrations
  tags :exclude_from_kubernetes
+  urgency :low
+
  idempotent!

  # rubocop: disable CodeReuse/ActiveRecord

--- a/app/workers/propagate_integration_inherit_descendant_worker.rb
+++ b/app/workers/propagate_integration_inherit_descendant_worker.rb
@@ -4,11 +4,11 @@ class PropagateIntegrationInheritDescendantWorker
  include ApplicationWorker

  data_consistency :always
-
  sidekiq_options retry: 3
-
  feature_category :integrations
  tags :exclude_from_kubernetes
+  urgency :low
+
  idempotent!

  # rubocop: disable CodeReuse/ActiveRecord

--- a/app/workers/propagate_integration_inherit_worker.rb
+++ b/app/workers/propagate_integration_inherit_worker.rb
@@ -4,11 +4,11 @@ class PropagateIntegrationInheritWorker
  include ApplicationWorker

  data_consistency :always
-
  sidekiq_options retry: 3
-
  feature_category :integrations
  tags :exclude_from_kubernetes
+  urgency :low
+
  idempotent!

  # rubocop: disable CodeReuse/ActiveRecord

--- a/app/workers/propagate_integration_project_worker.rb
+++ b/app/workers/propagate_integration_project_worker.rb
@@ -4,11 +4,11 @@ class PropagateIntegrationProjectWorker
  include ApplicationWorker

  data_consistency :always
-
  sidekiq_options retry: 3
-
  feature_category :integrations
  tags :exclude_from_kubernetes
+  urgency :low
+
  idempotent!

  # rubocop: disable CodeReuse/ActiveRecord

--- a/app/workers/propagate_integration_worker.rb
+++ b/app/workers/propagate_integration_worker.rb
@@ -4,12 +4,12 @@ class PropagateIntegrationWorker
  include ApplicationWorker

  data_consistency :always
-
  sidekiq_options retry: 3
-
  feature_category :integrations
-  idempotent!
  loggable_arguments 1
+  urgency :low
+
+  idempotent!

  def perform(integration_id)
    Admin::PropagateIntegrationService.propagate(Integration.find(integration_id))

--- a/app/workers/propagate_service_template_worker.rb
+++ b/app/workers/propagate_service_template_worker.rb
 # frozen_string_literal: true

-# Worker for updating any project specific caches.
+# No longer in use https://gitlab.com/groups/gitlab-org/-/epics/5672
+# To be removed https://gitlab.com/gitlab-org/gitlab/-/issues/335178
 class PropagateServiceTemplateWorker # rubocop:disable Scalability/IdempotentWorker
  include ApplicationWorker


--- a/app/workers/web_hook_worker.rb
+++ b/app/workers/web_hook_worker.rb
@@ -6,11 +6,12 @@ class WebHookWorker
  include ApplicationWorker

  feature_category :integrations
-  worker_has_external_dependencies!
  loggable_arguments 2
  data_consistency :delayed
-
  sidekiq_options retry: 4, dead: false
+  urgency :low
+
+  worker_has_external_dependencies!

  def perform(hook_id, data, hook_name)
    hook = WebHook.find(hook_id)

--- a/app/workers/web_hooks/destroy_worker.rb
+++ b/app/workers/web_hooks/destroy_worker.rb
@@ -5,12 +5,11 @@ module WebHooks
    include ApplicationWorker

    data_consistency :always
-
    sidekiq_options retry: 3
-
    feature_category :integrations
    tags :exclude_from_kubernetes
    urgency :low
+
    idempotent!

    def perform(user_id, web_hook_id)

--- a/app/workers/web_hooks/log_execution_worker.rb
+++ b/app/workers/web_hooks/log_execution_worker.rb
@@ -5,11 +5,11 @@ module WebHooks
    include ApplicationWorker

    data_consistency :always
-
-    idempotent!
    feature_category :integrations
    urgency :low

+    idempotent!
+
    # This worker accepts an extra argument. This enables us to
    # treat this worker as idempotent. Currently this is set to
    # the Job ID (jid) of the parent worker.