Merge branch 'tag-workers-as-excluded-from-gitlab-com' into 'master'

Tag some workers that we don't run on GitLab.com See merge request gitlab-org/gitlab!61238

Merge branch 'tag-workers-as-excluded-from-gitlab-com' into 'master'
Tag some workers that we don't run on GitLab.com See merge request gitlab-org/gitlab!61238
628d98ca · Bob Van Landuyt · 59e23109 · aa93ddb9 · 628d98ca · 628d98ca
Commit 628d98ca authored May 07, 2021 by Bob Van Landuyt
36 changed files
--- a/app/workers/all_queues.yml
+++ b/app/workers/all_queues.yml
@@ -65,7 +65,8 @@
  :resource_boundary: :unknown
  :weight: 2
  :idempotent:
-  :tags: []
+  :tags:
+  - :exclude_from_gitlab_com
 - :name: chaos:chaos_db_spin
  :worker_name: Chaos::DbSpinWorker
  :feature_category: :not_owned
@@ -74,7 +75,8 @@
  :resource_boundary: :unknown
  :weight: 2
  :idempotent:
-  :tags: []
+  :tags:
+  - :exclude_from_gitlab_com
 - :name: chaos:chaos_kill
  :worker_name: Chaos::KillWorker
  :feature_category: :not_owned
@@ -83,7 +85,8 @@
  :resource_boundary: :unknown
  :weight: 2
  :idempotent:
-  :tags: []
+  :tags:
+  - :exclude_from_gitlab_com
 - :name: chaos:chaos_leak_mem
  :worker_name: Chaos::LeakMemWorker
  :feature_category: :not_owned
@@ -92,7 +95,8 @@
  :resource_boundary: :unknown
  :weight: 2
  :idempotent:
-  :tags: []
+  :tags:
+  - :exclude_from_gitlab_com
 - :name: chaos:chaos_sleep
  :worker_name: Chaos::SleepWorker
  :feature_category: :not_owned
@@ -101,7 +105,8 @@
  :resource_boundary: :unknown
  :weight: 2
  :idempotent:
-  :tags: []
+  :tags:
+  - :exclude_from_gitlab_com
 - :name: container_repository:cleanup_container_repository
  :worker_name: CleanupContainerRepositoryWorker
  :feature_category: :container_registry
@@ -1014,7 +1019,8 @@
  :resource_boundary: :unknown
  :weight: 1
  :idempotent:
-  :tags: []
+  :tags:
+  - :exclude_from_gitlab_com
 - :name: hashed_storage:hashed_storage_project_migrate
  :worker_name: HashedStorage::ProjectMigrateWorker
  :feature_category: :source_code_management
@@ -1023,7 +1029,8 @@
  :resource_boundary: :unknown
  :weight: 1
  :idempotent:
-  :tags: []
+  :tags:
+  - :exclude_from_gitlab_com
 - :name: hashed_storage:hashed_storage_project_rollback
  :worker_name: HashedStorage::ProjectRollbackWorker
  :feature_category: :source_code_management
@@ -1032,7 +1039,8 @@
  :resource_boundary: :unknown
  :weight: 1
  :idempotent:
-  :tags: []
+  :tags:
+  - :exclude_from_gitlab_com
 - :name: hashed_storage:hashed_storage_rollbacker
  :worker_name: HashedStorage::RollbackerWorker
  :feature_category: :source_code_management
@@ -1041,7 +1049,8 @@
  :resource_boundary: :unknown
  :weight: 1
  :idempotent:
-  :tags: []
+  :tags:
+  - :exclude_from_gitlab_com
 - :name: incident_management:clusters_applications_check_prometheus_health
  :worker_name: Clusters::Applications::CheckPrometheusHealthWorker
  :feature_category: :incident_management

--- a/app/workers/concerns/chaos_queue.rb
+++ b/app/workers/concerns/chaos_queue.rb
@@ -6,5 +6,6 @@ module ChaosQueue
  included do
    queue_namespace :chaos
    feature_category_not_owned!
+    tags :exclude_from_gitlab_com
  end
 end
--- a/app/workers/hashed_storage/migrator_worker.rb
+++ b/app/workers/hashed_storage/migrator_worker.rb
@@ -8,6 +8,7 @@ module HashedStorage

    queue_namespace :hashed_storage
    feature_category :source_code_management
+    tags :exclude_from_gitlab_com

    # @param [Integer] start initial ID of the batch
    # @param [Integer] finish last ID of the batch

--- a/app/workers/hashed_storage/project_migrate_worker.rb
+++ b/app/workers/hashed_storage/project_migrate_worker.rb
@@ -8,6 +8,7 @@ module HashedStorage

    queue_namespace :hashed_storage
    loggable_arguments 1
+    tags :exclude_from_gitlab_com

    attr_reader :project_id


--- a/app/workers/hashed_storage/project_rollback_worker.rb
+++ b/app/workers/hashed_storage/project_rollback_worker.rb
@@ -8,6 +8,7 @@ module HashedStorage

    queue_namespace :hashed_storage
    loggable_arguments 1
+    tags :exclude_from_gitlab_com

    attr_reader :project_id


--- a/app/workers/hashed_storage/rollbacker_worker.rb
+++ b/app/workers/hashed_storage/rollbacker_worker.rb
@@ -8,6 +8,7 @@ module HashedStorage

    queue_namespace :hashed_storage
    feature_category :source_code_management
+    tags :exclude_from_gitlab_com

    # @param [Integer] start initial ID of the batch
    # @param [Integer] finish last ID of the batch

--- a/ee/app/workers/all_queues.yml
+++ b/ee/app/workers/all_queues.yml
--- a/ee/app/workers/concerns/geo_queue.rb
+++ b/ee/app/workers/concerns/geo_queue.rb
@@ -7,5 +7,6 @@ module GeoQueue
  included do
    queue_namespace :geo
    feature_category :geo_replication
+    tags :exclude_from_gitlab_com
  end
 end
--- a/ee/app/workers/geo/container_repository_sync_dispatch_worker.rb
+++ b/ee/app/workers/geo/container_repository_sync_dispatch_worker.rb
@@ -7,6 +7,8 @@ module Geo
    include CronjobQueue
    # rubocop:enable Scalability/CronWorkerContext

+    tags :exclude_from_gitlab_com
+
    def perform
      unless ::Geo::ContainerRepositoryRegistry.replication_enabled?
        log_info('Container Registry replication is not enabled')

--- a/ee/app/workers/geo/design_repository_shard_sync_worker.rb
+++ b/ee/app/workers/geo/design_repository_shard_sync_worker.rb
@@ -2,6 +2,8 @@

 module Geo
  class DesignRepositoryShardSyncWorker < RepositoryShardSyncWorker # rubocop:disable Scalability/IdempotentWorker
+    tags :exclude_from_gitlab_com
+
    private

    def schedule_job(project_id)

--- a/ee/app/workers/geo/destroy_worker.rb
+++ b/ee/app/workers/geo/destroy_worker.rb
@@ -10,7 +10,7 @@ module Geo

    idempotent!

-    tags :exclude_from_kubernetes
+    tags :exclude_from_kubernetes, :exclude_from_gitlab_com
    loggable_arguments 0

    def perform(replicable_name, replicable_id)

--- a/ee/app/workers/geo/file_download_dispatch_worker.rb
+++ b/ee/app/workers/geo/file_download_dispatch_worker.rb
@@ -7,6 +7,8 @@ module Geo
    include CronjobQueue
    # rubocop:enable Scalability/CronWorkerContext

+    tags :exclude_from_gitlab_com
+
    private

    # Cannot utilise backoff because there are no events currently being

--- a/ee/app/workers/geo/metrics_update_worker.rb
+++ b/ee/app/workers/geo/metrics_update_worker.rb
@@ -12,6 +12,7 @@ module Geo
    # rubocop:enable Scalability/CronWorkerContext

    feature_category :geo_replication
+    tags :exclude_from_gitlab_com

    LEASE_TIMEOUT = 5.minutes


--- a/ee/app/workers/geo/prune_event_log_worker.rb
+++ b/ee/app/workers/geo/prune_event_log_worker.rb
@@ -12,6 +12,7 @@ module Geo
    include ::Gitlab::Geo::LogHelpers

    feature_category :geo_replication
+    tags :exclude_from_gitlab_com

    def perform
      return if Gitlab::Database.read_only?

--- a/ee/app/workers/geo/repository_shard_sync_worker.rb
+++ b/ee/app/workers/geo/repository_shard_sync_worker.rb
@@ -4,6 +4,7 @@ module Geo
  class RepositoryShardSyncWorker < Geo::Scheduler::Secondary::SchedulerWorker # rubocop:disable Scalability/IdempotentWorker
    sidekiq_options retry: false
    loggable_arguments 0
+    tags :exclude_from_gitlab_com

    attr_accessor :shard_name


--- a/ee/app/workers/geo/repository_sync_worker.rb
+++ b/ee/app/workers/geo/repository_sync_worker.rb
@@ -2,6 +2,8 @@

 module Geo
  class RepositorySyncWorker < Geo::Scheduler::Secondary::PerShardSchedulerWorker # rubocop:disable Scalability/IdempotentWorker
+    tags :exclude_from_gitlab_com
+
    def schedule_job(shard_name)
      Geo::RepositoryShardSyncWorker.perform_async(shard_name)
      Geo::DesignRepositoryShardSyncWorker.perform_async(shard_name)

--- a/ee/app/workers/geo/repository_verification/primary/batch_worker.rb
+++ b/ee/app/workers/geo/repository_verification/primary/batch_worker.rb
@@ -4,6 +4,8 @@ module Geo
  module RepositoryVerification
    module Primary
      class BatchWorker < Geo::Scheduler::Primary::PerShardSchedulerWorker # rubocop:disable Scalability/IdempotentWorker
+        tags :exclude_from_gitlab_com
+
        def perform
          return unless Gitlab::Geo.repository_verification_enabled?


--- a/ee/app/workers/geo/repository_verification/primary/shard_worker.rb
+++ b/ee/app/workers/geo/repository_verification/primary/shard_worker.rb
@@ -6,6 +6,7 @@ module Geo
      class ShardWorker < Geo::Scheduler::Primary::SchedulerWorker # rubocop:disable Scalability/IdempotentWorker
        sidekiq_options retry: false
        loggable_arguments 0
+        tags :exclude_from_gitlab_com

        attr_accessor :shard_name


--- a/ee/app/workers/geo/repository_verification/primary/single_worker.rb
+++ b/ee/app/workers/geo/repository_verification/primary/single_worker.rb
@@ -9,6 +9,7 @@ module Geo
        include ExclusiveLeaseGuard

        sidekiq_options retry: false
+        tags :exclude_from_gitlab_com

        LEASE_TIMEOUT = 1.hour.to_i


--- a/ee/app/workers/geo/repository_verification/secondary/scheduler_worker.rb
+++ b/ee/app/workers/geo/repository_verification/secondary/scheduler_worker.rb
@@ -4,6 +4,8 @@ module Geo
  module RepositoryVerification
    module Secondary
      class SchedulerWorker < Geo::Scheduler::Secondary::PerShardSchedulerWorker # rubocop:disable Scalability/IdempotentWorker
+        tags :exclude_from_gitlab_com
+
        def perform
          return unless Gitlab::Geo.repository_verification_enabled?


--- a/ee/app/workers/geo/repository_verification/secondary/shard_worker.rb
+++ b/ee/app/workers/geo/repository_verification/secondary/shard_worker.rb
@@ -12,6 +12,7 @@ module Geo
        attr_accessor :shard_name

        loggable_arguments 0
+        tags :exclude_from_gitlab_com

        def perform(shard_name)
          @shard_name = shard_name

--- a/ee/app/workers/geo/repository_verification/secondary/single_worker.rb
+++ b/ee/app/workers/geo/repository_verification/secondary/single_worker.rb
@@ -10,6 +10,7 @@ module Geo
        include Gitlab::Geo::ProjectLogHelpers

        sidekiq_options retry: false
+        tags :exclude_from_gitlab_com

        LEASE_TIMEOUT = 1.hour.to_i


--- a/ee/app/workers/geo/reverification_batch_worker.rb
+++ b/ee/app/workers/geo/reverification_batch_worker.rb
@@ -15,7 +15,7 @@ module Geo
    MAX_RUNNING_JOBS = 1

    idempotent!
-    tags :exclude_from_kubernetes
+    tags :exclude_from_kubernetes, :exclude_from_gitlab_com
    loggable_arguments 0

    def perform_work(replicable_name)

--- a/ee/app/workers/geo/scheduler/per_shard_scheduler_worker.rb
+++ b/ee/app/workers/geo/scheduler/per_shard_scheduler_worker.rb
@@ -14,6 +14,7 @@ module Geo
      include ::EachShardWorker

      feature_category :geo_replication
+      tags :exclude_from_gitlab_com

      # These workers are enqueued every minute by sidekiq-cron. If one of them
      # is already enqueued or running, then there isn't a strong case for

--- a/ee/app/workers/geo/scheduler/primary/per_shard_scheduler_worker.rb
+++ b/ee/app/workers/geo/scheduler/primary/per_shard_scheduler_worker.rb
@@ -4,6 +4,8 @@ module Geo
  module Scheduler
    module Primary
      class PerShardSchedulerWorker < Geo::Scheduler::PerShardSchedulerWorker # rubocop:disable Scalability/IdempotentWorker
+        tags :exclude_from_gitlab_com
+
        def perform
          unless Gitlab::Geo.primary?
            log_info('Current node not a primary')

--- a/ee/app/workers/geo/scheduler/primary/scheduler_worker.rb
+++ b/ee/app/workers/geo/scheduler/primary/scheduler_worker.rb
@@ -4,6 +4,8 @@ module Geo
  module Scheduler
    module Primary
      class SchedulerWorker < Geo::Scheduler::SchedulerWorker # rubocop:disable Scalability/IdempotentWorker
+        tags :exclude_from_gitlab_com
+
        def perform
          return unless Gitlab::Geo.primary?


--- a/ee/app/workers/geo/scheduler/secondary/per_shard_scheduler_worker.rb
+++ b/ee/app/workers/geo/scheduler/secondary/per_shard_scheduler_worker.rb
@@ -4,6 +4,8 @@ module Geo
  module Scheduler
    module Secondary
      class PerShardSchedulerWorker < Geo::Scheduler::PerShardSchedulerWorker # rubocop:disable Scalability/IdempotentWorker
+        tags :exclude_from_gitlab_com
+
        def perform
          unless Gitlab::Geo.geo_database_configured?
            log_info('Geo database not configured')

--- a/ee/app/workers/geo/scheduler/secondary/scheduler_worker.rb
+++ b/ee/app/workers/geo/scheduler/secondary/scheduler_worker.rb
@@ -4,6 +4,8 @@ module Geo
  module Scheduler
    module Secondary
      class SchedulerWorker < Geo::Scheduler::SchedulerWorker # rubocop:disable Scalability/IdempotentWorker
+        tags :exclude_from_gitlab_com
+
        def perform
          unless Gitlab::Geo.geo_database_configured?
            log_info('Geo database not configured')

--- a/ee/app/workers/geo/secondary/registry_consistency_worker.rb
+++ b/ee/app/workers/geo/secondary/registry_consistency_worker.rb
@@ -16,6 +16,7 @@ module Geo
      include CronjobQueue # rubocop:disable Scalability/CronWorkerContext

      feature_category :geo_replication
+      tags :exclude_from_gitlab_com

      REGISTRY_CLASSES = [
        Geo::ContainerRepositoryRegistry,

--- a/ee/app/workers/geo/secondary_usage_data_cron_worker.rb
+++ b/ee/app/workers/geo/secondary_usage_data_cron_worker.rb
@@ -12,7 +12,7 @@ module Geo
    include ExclusiveLeaseGuard

    feature_category :geo_replication
-    tags :exclude_from_kubernetes
+    tags :exclude_from_kubernetes, :exclude_from_gitlab_com

    def perform
      return unless Gitlab::Geo.secondary?

--- a/ee/app/workers/geo/sync_timeout_cron_worker.rb
+++ b/ee/app/workers/geo/sync_timeout_cron_worker.rb
@@ -12,7 +12,7 @@ module Geo
    idempotent!
    sidekiq_options retry: false, dead: false
    feature_category :geo_replication
-    tags :exclude_from_kubernetes
+    tags :exclude_from_kubernetes, :exclude_from_gitlab_com

    def perform
      Gitlab::Geo.enabled_replicator_classes.each do |replicator_class|

--- a/ee/app/workers/geo/verification_batch_worker.rb
+++ b/ee/app/workers/geo/verification_batch_worker.rb
@@ -10,7 +10,7 @@ module Geo
    include ::Gitlab::Geo::LogHelpers

    idempotent!
-    tags :exclude_from_kubernetes
+    tags :exclude_from_kubernetes, :exclude_from_gitlab_com
    loggable_arguments 0

    def perform_work(replicable_name)

--- a/ee/app/workers/geo/verification_cron_worker.rb
+++ b/ee/app/workers/geo/verification_cron_worker.rb
@@ -16,7 +16,7 @@ module Geo
    idempotent!

    feature_category :geo_replication
-    tags :exclude_from_kubernetes
+    tags :exclude_from_kubernetes, :exclude_from_gitlab_com

    def perform
      Gitlab::Geo.verification_enabled_replicator_classes.each do |replicator_class|

--- a/ee/app/workers/geo/verification_timeout_worker.rb
+++ b/ee/app/workers/geo/verification_timeout_worker.rb
@@ -9,7 +9,7 @@ module Geo

    idempotent!
    sidekiq_options retry: false, dead: false
-    tags :exclude_from_kubernetes
+    tags :exclude_from_kubernetes, :exclude_from_gitlab_com
    loggable_arguments 0

    def perform(replicable_name)

--- a/ee/app/workers/geo/verification_worker.rb
+++ b/ee/app/workers/geo/verification_worker.rb
@@ -9,7 +9,7 @@ module Geo
    sidekiq_options retry: 3, dead: false

    idempotent!
-    tags :exclude_from_kubernetes
+    tags :exclude_from_kubernetes, :exclude_from_gitlab_com
    loggable_arguments 0

    def perform(replicable_name, replicable_id)

--- a/ee/app/workers/ldap_group_sync_worker.rb
+++ b/ee/app/workers/ldap_group_sync_worker.rb
@@ -9,6 +9,7 @@ class LdapGroupSyncWorker # rubocop:disable Scalability/IdempotentWorker
  worker_has_external_dependencies!
  weight 2
  loggable_arguments 0, 1
+  tags :exclude_from_gitlab_com

  # rubocop: disable CodeReuse/ActiveRecord
  def perform(group_ids, provider = nil)