Remove confusing retry option for cronjob workers

In https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59907 we explicitly set the number of retries for all existing workers to 3. However, this included workers that use CronjobQueue, where retries are disabled, which was confusing. We were essentially doing: class MyWorker include ApplicationWorker sidekiq_options retry: 3 # In the worker class include CronjobQueue # Which does ... sidekiq_options retry: false # ... and this takes precedence end This change simply removes `retry: 3` from all workers that include the CronjobQueue. Done with: ag -l 'retry: 3' app/workers/ ee/app/workers/ | xargs ag -l CronjobQueue | xargs -L1 sed -z -i'' 's/\n *sidekiq_options retry: 3\n/\n/g' But other file searching and editing tools are available too.

Remove confusing retry option for cronjob workers
In https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59907 we explicitly set the number of retries for all existing workers to 3. However, this included workers that use CronjobQueue, where retries are disabled, which was confusing. We were essentially doing: class MyWorker include ApplicationWorker sidekiq_options retry: 3 # In the worker class include CronjobQueue # Which does ... sidekiq_options retry: false # ... and this takes precedence end This change simply removes `retry: 3` from all workers that include the CronjobQueue. Done with: ag -l 'retry: 3' app/workers/ ee/app/workers/ | xargs ag -l CronjobQueue | xargs -L1 sed -z -i'' 's/\n *sidekiq_options retry: 3\n/\n/g' But other file searching and editing tools are available too.
26b34c2a · Sean McGivern · f062cb0d · 26b34c2a · 26b34c2a · 26b34c2a
Commit 26b34c2a authored Jul 28, 2021 by Sean McGivern
72 changed files
--- a/app/workers/admin_email_worker.rb
+++ b/app/workers/admin_email_worker.rb
@@ -5,7 +5,6 @@ class AdminEmailWorker # rubocop:disable Scalability/IdempotentWorker

  data_consistency :always

-  sidekiq_options retry: 3
  # rubocop:disable Scalability/CronWorkerContext
  # This worker does not perform work scoped to a context
  include CronjobQueue

--- a/app/workers/analytics/usage_trends/count_job_trigger_worker.rb
+++ b/app/workers/analytics/usage_trends/count_job_trigger_worker.rb
@@ -8,7 +8,6 @@ module Analytics

      data_consistency :always

-      sidekiq_options retry: 3
      include CronjobQueue # rubocop:disable Scalability/CronWorkerContext

      DEFAULT_DELAY = 3.minutes.freeze

--- a/app/workers/authorized_project_update/periodic_recalculate_worker.rb
+++ b/app/workers/authorized_project_update/periodic_recalculate_worker.rb
@@ -6,7 +6,6 @@ module AuthorizedProjectUpdate

    data_consistency :always

-    sidekiq_options retry: 3
    # This worker does not perform work scoped to a context
    include CronjobQueue # rubocop:disable Scalability/CronWorkerContext


--- a/app/workers/ci/archive_traces_cron_worker.rb
+++ b/app/workers/ci/archive_traces_cron_worker.rb
@@ -6,7 +6,6 @@ module Ci

    data_consistency :always

-    sidekiq_options retry: 3
    include CronjobQueue # rubocop:disable Scalability/CronWorkerContext

    feature_category :continuous_integration

--- a/app/workers/ci/pipeline_artifacts/expire_artifacts_worker.rb
+++ b/app/workers/ci/pipeline_artifacts/expire_artifacts_worker.rb
@@ -7,7 +7,6 @@ module Ci

      data_consistency :always

-      sidekiq_options retry: 3
      # rubocop:disable Scalability/CronWorkerContext
      # This worker does not perform work scoped to a context
      include CronjobQueue

--- a/app/workers/ci/schedule_delete_objects_cron_worker.rb
+++ b/app/workers/ci/schedule_delete_objects_cron_worker.rb
@@ -6,7 +6,6 @@ module Ci

    data_consistency :always

-    sidekiq_options retry: 3
    # rubocop:disable Scalability/CronWorkerContext
    # This worker does not perform work scoped to a context
    include CronjobQueue

--- a/app/workers/ci_platform_metrics_update_cron_worker.rb
+++ b/app/workers/ci_platform_metrics_update_cron_worker.rb
@@ -5,8 +5,6 @@ class CiPlatformMetricsUpdateCronWorker # rubocop:disable Scalability/Idempotent

  data_consistency :always

-  sidekiq_options retry: 3
-
  # This worker does not perform work scoped to a context
  include CronjobQueue # rubocop:disable Scalability/CronWorkerContext


--- a/app/workers/clusters/applications/check_prometheus_health_worker.rb
+++ b/app/workers/clusters/applications/check_prometheus_health_worker.rb
@@ -7,7 +7,6 @@ module Clusters

      data_consistency :always

-      sidekiq_options retry: 3
      # rubocop:disable Scalability/CronWorkerContext
      # This worker does not perform work scoped to a context
      include CronjobQueue

--- a/app/workers/container_expiration_policy_worker.rb
+++ b/app/workers/container_expiration_policy_worker.rb
@@ -5,7 +5,6 @@ class ContainerExpirationPolicyWorker # rubocop:disable Scalability/IdempotentWo

  data_consistency :always

-  sidekiq_options retry: 3
  include CronjobQueue
  include ExclusiveLeaseGuard


--- a/app/workers/database/batched_background_migration_worker.rb
+++ b/app/workers/database/batched_background_migration_worker.rb
@@ -6,7 +6,6 @@ module Database

    data_consistency :always

-    sidekiq_options retry: 3
    include CronjobQueue # rubocop:disable Scalability/CronWorkerContext

    feature_category :database

--- a/app/workers/database/partition_management_worker.rb
+++ b/app/workers/database/partition_management_worker.rb
@@ -4,7 +4,6 @@ module Database
  class PartitionManagementWorker
    include ApplicationWorker

-    sidekiq_options retry: 3
    include CronjobQueue # rubocop:disable Scalability/CronWorkerContext

    data_consistency :always

--- a/app/workers/environments/auto_stop_cron_worker.rb
+++ b/app/workers/environments/auto_stop_cron_worker.rb
@@ -6,7 +6,6 @@ module Environments

    data_consistency :always

-    sidekiq_options retry: 3
    include CronjobQueue # rubocop:disable Scalability/CronWorkerContext

    feature_category :continuous_delivery

--- a/app/workers/expire_build_artifacts_worker.rb
+++ b/app/workers/expire_build_artifacts_worker.rb
@@ -5,7 +5,6 @@ class ExpireBuildArtifactsWorker # rubocop:disable Scalability/IdempotentWorker

  data_consistency :always

-  sidekiq_options retry: 3
  # rubocop:disable Scalability/CronWorkerContext
  # This worker does not perform work scoped to a context
  include CronjobQueue

--- a/app/workers/gitlab/import/stuck_import_job.rb
+++ b/app/workers/gitlab/import/stuck_import_job.rb
@@ -10,7 +10,6 @@ module Gitlab
      included do
        include ApplicationWorker

-        sidekiq_options retry: 3
        # rubocop:disable Scalability/CronWorkerContext
        # This worker updates several import states inline and does not schedule
        # other jobs. So no context needed

--- a/app/workers/import_export_project_cleanup_worker.rb
+++ b/app/workers/import_export_project_cleanup_worker.rb
@@ -5,7 +5,6 @@ class ImportExportProjectCleanupWorker # rubocop:disable Scalability/IdempotentW

  data_consistency :always

-  sidekiq_options retry: 3
  # rubocop:disable Scalability/CronWorkerContext
  # This worker does not perform work scoped to a context
  include CronjobQueue

--- a/app/workers/issue_due_scheduler_worker.rb
+++ b/app/workers/issue_due_scheduler_worker.rb
@@ -5,7 +5,6 @@ class IssueDueSchedulerWorker # rubocop:disable Scalability/IdempotentWorker

  data_consistency :always

-  sidekiq_options retry: 3
  include CronjobQueue # rubocop:disable Scalability/CronWorkerContext

  feature_category :issue_tracking

--- a/app/workers/member_invitation_reminder_emails_worker.rb
+++ b/app/workers/member_invitation_reminder_emails_worker.rb
@@ -5,7 +5,6 @@ class MemberInvitationReminderEmailsWorker # rubocop:disable Scalability/Idempot

  data_consistency :always

-  sidekiq_options retry: 3
  include CronjobQueue # rubocop:disable Scalability/CronWorkerContext

  feature_category :subgroups

--- a/app/workers/metrics/dashboard/schedule_annotations_prune_worker.rb
+++ b/app/workers/metrics/dashboard/schedule_annotations_prune_worker.rb
@@ -7,7 +7,6 @@ module Metrics

      data_consistency :always

-      sidekiq_options retry: 3
      # rubocop:disable Scalability/CronWorkerContext
      # This worker does not perform work scoped to a context
      include CronjobQueue

--- a/app/workers/namespaces/in_product_marketing_emails_worker.rb
+++ b/app/workers/namespaces/in_product_marketing_emails_worker.rb
@@ -6,7 +6,6 @@ module Namespaces

    data_consistency :always

-    sidekiq_options retry: 3
    include CronjobQueue # rubocop:disable Scalability/CronWorkerContext

    feature_category :subgroups

--- a/app/workers/namespaces/prune_aggregation_schedules_worker.rb
+++ b/app/workers/namespaces/prune_aggregation_schedules_worker.rb
@@ -6,7 +6,6 @@ module Namespaces

    data_consistency :always

-    sidekiq_options retry: 3
    include CronjobQueue # rubocop:disable Scalability/CronWorkerContext

    feature_category :source_code_management

--- a/app/workers/packages/composer/cache_cleanup_worker.rb
+++ b/app/workers/packages/composer/cache_cleanup_worker.rb
@@ -7,7 +7,6 @@ module Packages

      data_consistency :always

-      sidekiq_options retry: 3
      include CronjobQueue # rubocop:disable Scalability/CronWorkerContext

      feature_category :package_registry

--- a/app/workers/pages_domain_removal_cron_worker.rb
+++ b/app/workers/pages_domain_removal_cron_worker.rb
@@ -5,7 +5,6 @@ class PagesDomainRemovalCronWorker # rubocop:disable Scalability/IdempotentWorke

  data_consistency :always

-  sidekiq_options retry: 3
  include CronjobQueue

  feature_category :pages

--- a/app/workers/pages_domain_ssl_renewal_cron_worker.rb
+++ b/app/workers/pages_domain_ssl_renewal_cron_worker.rb
@@ -5,7 +5,6 @@ class PagesDomainSslRenewalCronWorker # rubocop:disable Scalability/IdempotentWo

  data_consistency :always

-  sidekiq_options retry: 3
  include CronjobQueue

  feature_category :pages

--- a/app/workers/pages_domain_verification_cron_worker.rb
+++ b/app/workers/pages_domain_verification_cron_worker.rb
@@ -5,7 +5,6 @@ class PagesDomainVerificationCronWorker # rubocop:disable Scalability/Idempotent

  data_consistency :always

-  sidekiq_options retry: 3
  include CronjobQueue

  feature_category :pages

--- a/app/workers/partition_creation_worker.rb
+++ b/app/workers/partition_creation_worker.rb
@@ -5,7 +5,6 @@ class PartitionCreationWorker

  data_consistency :always

-  sidekiq_options retry: 3
  include CronjobQueue # rubocop:disable Scalability/CronWorkerContext

  feature_category :database

--- a/app/workers/personal_access_tokens/expired_notification_worker.rb
+++ b/app/workers/personal_access_tokens/expired_notification_worker.rb
@@ -6,7 +6,6 @@ module PersonalAccessTokens

    data_consistency :always

-    sidekiq_options retry: 3
    include CronjobQueue

    feature_category :authentication_and_authorization

--- a/app/workers/personal_access_tokens/expiring_worker.rb
+++ b/app/workers/personal_access_tokens/expiring_worker.rb
@@ -6,7 +6,6 @@ module PersonalAccessTokens

    data_consistency :always

-    sidekiq_options retry: 3
    include CronjobQueue

    feature_category :authentication_and_authorization

--- a/app/workers/pipeline_schedule_worker.rb
+++ b/app/workers/pipeline_schedule_worker.rb
@@ -5,7 +5,6 @@ class PipelineScheduleWorker # rubocop:disable Scalability/IdempotentWorker

  data_consistency :always

-  sidekiq_options retry: 3
  include CronjobQueue

  feature_category :continuous_integration

--- a/app/workers/prune_old_events_worker.rb
+++ b/app/workers/prune_old_events_worker.rb
@@ -5,7 +5,6 @@ class PruneOldEventsWorker # rubocop:disable Scalability/IdempotentWorker

  data_consistency :always

-  sidekiq_options retry: 3
  # rubocop:disable Scalability/CronWorkerContext
  # This worker does not perform work scoped to a context
  include CronjobQueue

--- a/app/workers/releases/manage_evidence_worker.rb
+++ b/app/workers/releases/manage_evidence_worker.rb
@@ -6,7 +6,6 @@ module Releases

    data_consistency :always

-    sidekiq_options retry: 3
    include CronjobQueue # rubocop:disable Scalability/CronWorkerContext

    feature_category :release_evidence

--- a/app/workers/remove_expired_group_links_worker.rb
+++ b/app/workers/remove_expired_group_links_worker.rb
@@ -5,7 +5,6 @@ class RemoveExpiredGroupLinksWorker # rubocop:disable Scalability/IdempotentWork

  data_consistency :always

-  sidekiq_options retry: 3
  include CronjobQueue # rubocop:disable Scalability/CronWorkerContext

  feature_category :authentication_and_authorization

--- a/app/workers/remove_expired_members_worker.rb
+++ b/app/workers/remove_expired_members_worker.rb
@@ -5,7 +5,6 @@ class RemoveExpiredMembersWorker # rubocop:disable Scalability/IdempotentWorker

  data_consistency :always

-  sidekiq_options retry: 3
  include CronjobQueue

  feature_category :authentication_and_authorization

--- a/app/workers/remove_unaccepted_member_invites_worker.rb
+++ b/app/workers/remove_unaccepted_member_invites_worker.rb
@@ -5,7 +5,6 @@ class RemoveUnacceptedMemberInvitesWorker # rubocop:disable Scalability/Idempote

  data_consistency :always

-  sidekiq_options retry: 3
  include CronjobQueue # rubocop:disable Scalability/CronWorkerContext

  feature_category :authentication_and_authorization

--- a/app/workers/remove_unreferenced_lfs_objects_worker.rb
+++ b/app/workers/remove_unreferenced_lfs_objects_worker.rb
@@ -5,7 +5,6 @@ class RemoveUnreferencedLfsObjectsWorker

  data_consistency :always

-  sidekiq_options retry: 3
  # rubocop:disable Scalability/CronWorkerContext
  # This worker does not perform work scoped to a context
  include CronjobQueue

--- a/app/workers/repository_archive_cache_worker.rb
+++ b/app/workers/repository_archive_cache_worker.rb
@@ -5,7 +5,6 @@ class RepositoryArchiveCacheWorker # rubocop:disable Scalability/IdempotentWorke

  data_consistency :always

-  sidekiq_options retry: 3
  # rubocop:disable Scalability/CronWorkerContext
  # This worker does not perform work scoped to a context
  include CronjobQueue

--- a/app/workers/repository_check/dispatch_worker.rb
+++ b/app/workers/repository_check/dispatch_worker.rb
@@ -6,7 +6,6 @@ module RepositoryCheck

    data_consistency :always

-    sidekiq_options retry: 3
    # rubocop:disable Scalability/CronWorkerContext
    # This worker does not perform work scoped to a context
    include CronjobQueue

--- a/app/workers/requests_profiles_worker.rb
+++ b/app/workers/requests_profiles_worker.rb
@@ -5,7 +5,6 @@ class RequestsProfilesWorker # rubocop:disable Scalability/IdempotentWorker

  data_consistency :always

-  sidekiq_options retry: 3
  # rubocop:disable Scalability/CronWorkerContext
  # This worker does not perform work scoped to a context
  include CronjobQueue

--- a/app/workers/schedule_merge_request_cleanup_refs_worker.rb
+++ b/app/workers/schedule_merge_request_cleanup_refs_worker.rb
@@ -5,7 +5,6 @@ class ScheduleMergeRequestCleanupRefsWorker

  data_consistency :always

-  sidekiq_options retry: 3
  include CronjobQueue # rubocop:disable Scalability/CronWorkerContext

  feature_category :code_review

--- a/app/workers/schedule_migrate_external_diffs_worker.rb
+++ b/app/workers/schedule_migrate_external_diffs_worker.rb
@@ -5,7 +5,6 @@ class ScheduleMigrateExternalDiffsWorker # rubocop:disable Scalability/Idempoten

  data_consistency :always

-  sidekiq_options retry: 3
  # rubocop:disable Scalability/CronWorkerContext:
  # This schedules the `MigrateExternalDiffsWorker`
  # issue for adding context: https://gitlab.com/gitlab-org/gitlab/issues/202100

--- a/app/workers/ssh_keys/expired_notification_worker.rb
+++ b/app/workers/ssh_keys/expired_notification_worker.rb
@@ -6,7 +6,6 @@ module SshKeys

    data_consistency :always

-    sidekiq_options retry: 3
    include CronjobQueue

    feature_category :compliance_management

--- a/app/workers/ssh_keys/expiring_soon_notification_worker.rb
+++ b/app/workers/ssh_keys/expiring_soon_notification_worker.rb
@@ -6,7 +6,6 @@ module SshKeys

    data_consistency :always

-    sidekiq_options retry: 3
    include CronjobQueue

    feature_category :compliance_management

--- a/app/workers/stuck_ci_jobs_worker.rb
+++ b/app/workers/stuck_ci_jobs_worker.rb
@@ -5,7 +5,6 @@ class StuckCiJobsWorker # rubocop:disable Scalability/IdempotentWorker

  data_consistency :always

-  sidekiq_options retry: 3
  include CronjobQueue

  feature_category :continuous_integration

--- a/app/workers/stuck_export_jobs_worker.rb
+++ b/app/workers/stuck_export_jobs_worker.rb
@@ -6,7 +6,6 @@ class StuckExportJobsWorker

  data_consistency :always

-  sidekiq_options retry: 3
  # rubocop:disable Scalability/CronWorkerContext
  # This worker updates export states inline and does not schedule
  # other jobs.

--- a/app/workers/stuck_merge_jobs_worker.rb
+++ b/app/workers/stuck_merge_jobs_worker.rb
@@ -5,7 +5,6 @@ class StuckMergeJobsWorker # rubocop:disable Scalability/IdempotentWorker

  data_consistency :always

-  sidekiq_options retry: 3
  include CronjobQueue # rubocop:disable Scalability/CronWorkerContext

  feature_category :code_review

--- a/app/workers/trending_projects_worker.rb
+++ b/app/workers/trending_projects_worker.rb
@@ -5,7 +5,6 @@ class TrendingProjectsWorker # rubocop:disable Scalability/IdempotentWorker

  data_consistency :always

-  sidekiq_options retry: 3
  include CronjobQueue # rubocop:disable Scalability/CronWorkerContext

  feature_category :source_code_management

--- a/app/workers/update_container_registry_info_worker.rb
+++ b/app/workers/update_container_registry_info_worker.rb
@@ -5,7 +5,6 @@ class UpdateContainerRegistryInfoWorker

  data_consistency :always

-  sidekiq_options retry: 3
  include CronjobQueue # rubocop:disable Scalability/CronWorkerContext

  feature_category :container_registry

--- a/app/workers/user_status_cleanup/batch_worker.rb
+++ b/app/workers/user_status_cleanup/batch_worker.rb
@@ -7,7 +7,6 @@ module UserStatusCleanup

    data_consistency :always

-    sidekiq_options retry: 3
    # rubocop:disable Scalability/CronWorkerContext
    include CronjobQueue
    # rubocop:enable Scalability/CronWorkerContext

--- a/app/workers/users/create_statistics_worker.rb
+++ b/app/workers/users/create_statistics_worker.rb
@@ -6,7 +6,6 @@ module Users

    data_consistency :always

-    sidekiq_options retry: 3
    # rubocop:disable Scalability/CronWorkerContext
    # This worker does not perform work scoped to a context
    include CronjobQueue

--- a/app/workers/x509_issuer_crl_check_worker.rb
+++ b/app/workers/x509_issuer_crl_check_worker.rb
@@ -5,7 +5,6 @@ class X509IssuerCrlCheckWorker

  data_consistency :always

-  sidekiq_options retry: 3
  include CronjobQueue

  feature_category :source_code_management

--- a/ee/app/workers/active_user_count_threshold_worker.rb
+++ b/ee/app/workers/active_user_count_threshold_worker.rb
@@ -5,7 +5,6 @@ class ActiveUserCountThresholdWorker # rubocop:disable Scalability/IdempotentWor

  data_consistency :always

-  sidekiq_options retry: 3
  # rubocop:disable Scalability/CronWorkerContext
  # This worker does not perform work scoped to a context
  include CronjobQueue

--- a/ee/app/workers/adjourned_group_deletion_worker.rb
+++ b/ee/app/workers/adjourned_group_deletion_worker.rb
@@ -5,7 +5,6 @@ class AdjournedGroupDeletionWorker # rubocop:disable Scalability/IdempotentWorke

  data_consistency :always

-  sidekiq_options retry: 3
  include CronjobQueue

  INTERVAL = 10.seconds.to_i

--- a/ee/app/workers/adjourned_projects_deletion_cron_worker.rb
+++ b/ee/app/workers/adjourned_projects_deletion_cron_worker.rb
@@ -5,7 +5,6 @@ class AdjournedProjectsDeletionCronWorker # rubocop:disable Scalability/Idempote

  data_consistency :always

-  sidekiq_options retry: 3
  include CronjobQueue

  INTERVAL = 10.seconds.to_i

--- a/ee/app/workers/analytics/devops_adoption/create_all_snapshots_worker.rb
+++ b/ee/app/workers/analytics/devops_adoption/create_all_snapshots_worker.rb
@@ -8,7 +8,6 @@ module Analytics

      data_consistency :always

-      sidekiq_options retry: 3
      # This worker does not perform work scoped to a context
      include CronjobQueue # rubocop:disable Scalability/CronWorkerContext


--- a/ee/app/workers/clear_shared_runners_minutes_worker.rb
+++ b/ee/app/workers/clear_shared_runners_minutes_worker.rb
@@ -5,7 +5,6 @@ class ClearSharedRunnersMinutesWorker # rubocop:disable Scalability/IdempotentWo

  data_consistency :always

-  sidekiq_options retry: 3
  # rubocop:disable Scalability/CronWorkerContext
  # This worker does not perform work scoped to a context
  # all queries are scoped across multiple namespaces

--- a/ee/app/workers/elastic/migration_worker.rb
+++ b/ee/app/workers/elastic/migration_worker.rb
@@ -6,7 +6,6 @@ module Elastic

    data_consistency :always

-    sidekiq_options retry: 3
    include Gitlab::ExclusiveLeaseHelpers
    # There is no onward scheduling and this cron handles work from across the
    # application, so there's no useful context to add.

--- a/ee/app/workers/elastic_remove_expired_namespace_subscriptions_from_index_cron_worker.rb
+++ b/ee/app/workers/elastic_remove_expired_namespace_subscriptions_from_index_cron_worker.rb
@@ -5,7 +5,6 @@ class ElasticRemoveExpiredNamespaceSubscriptionsFromIndexCronWorker

  data_consistency :always

-  sidekiq_options retry: 3
  include Gitlab::ExclusiveLeaseHelpers
  include CronjobQueue


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

    data_consistency :always

-    sidekiq_options retry: 3
    include ExclusiveLeaseGuard
    # rubocop:disable Scalability/CronWorkerContext
    # This worker does not perform work scoped to a context

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

    data_consistency :always

-    sidekiq_options retry: 3
    # rubocop:disable Scalability/CronWorkerContext
    # This worker does not perform work scoped to a context
    include CronjobQueue

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

      data_consistency :always

-      sidekiq_options retry: 3
      # rubocop:disable Scalability/CronWorkerContext
      # This worker does not perform work scoped to a context
      include CronjobQueue

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

      data_consistency :always

-      sidekiq_options retry: 3
      prepend Reenqueuer
      include ::Gitlab::Geo::LogHelpers


--- a/ee/app/workers/geo/secondary_usage_data_cron_worker.rb
+++ b/ee/app/workers/geo/secondary_usage_data_cron_worker.rb
@@ -8,7 +8,6 @@ module Geo

    data_consistency :always

-    sidekiq_options retry: 3
    include CronjobQueue # rubocop:disable Scalability/CronWorkerContext
    include ::Gitlab::Geo::LogHelpers
    include ExclusiveLeaseGuard

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

    data_consistency :always

-    sidekiq_options retry: 3
    # rubocop:disable Scalability/CronWorkerContext
    # This worker does not perform work scoped to a context
    include CronjobQueue

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

    data_consistency :always

-    sidekiq_options retry: 3
    include ::Gitlab::Geo::LogHelpers

    # This worker does not perform work scoped to a context

--- a/ee/app/workers/historical_data_worker.rb
+++ b/ee/app/workers/historical_data_worker.rb
@@ -5,7 +5,6 @@ class HistoricalDataWorker # rubocop:disable Scalability/IdempotentWorker

  data_consistency :always

-  sidekiq_options retry: 3
  # rubocop:disable Scalability/CronWorkerContext
  # This worker does not perform work scoped to a context
  include CronjobQueue

--- a/ee/app/workers/incident_management/incident_sla_exceeded_check_worker.rb
+++ b/ee/app/workers/incident_management/incident_sla_exceeded_check_worker.rb
@@ -6,7 +6,6 @@ module IncidentManagement

    data_consistency :always

-    sidekiq_options retry: 3
    include CronjobQueue # rubocop:disable Scalability/CronWorkerContext

    idempotent!

--- a/ee/app/workers/ldap_all_groups_sync_worker.rb
+++ b/ee/app/workers/ldap_all_groups_sync_worker.rb
@@ -5,7 +5,6 @@ class LdapAllGroupsSyncWorker # rubocop:disable Scalability/IdempotentWorker

  data_consistency :always

-  sidekiq_options retry: 3
  # rubocop:disable Scalability/CronWorkerContext
  # This worker does not perform work scoped to a context
  include CronjobQueue

--- a/ee/app/workers/ldap_sync_worker.rb
+++ b/ee/app/workers/ldap_sync_worker.rb
@@ -5,7 +5,6 @@ class LdapSyncWorker # rubocop:disable Scalability/IdempotentWorker

  data_consistency :always

-  sidekiq_options retry: 3
  include CronjobQueue # rubocop:disable Scalability/CronWorkerContext

  feature_category :authentication_and_authorization

--- a/ee/app/workers/pseudonymizer_worker.rb
+++ b/ee/app/workers/pseudonymizer_worker.rb
@@ -5,7 +5,6 @@ class PseudonymizerWorker # rubocop:disable Scalability/IdempotentWorker

  data_consistency :always

-  sidekiq_options retry: 3
  # rubocop:disable Scalability/CronWorkerContext
  # This worker does not perform work scoped to a context
  include CronjobQueue

--- a/ee/app/workers/update_all_mirrors_worker.rb
+++ b/ee/app/workers/update_all_mirrors_worker.rb
@@ -3,7 +3,6 @@
 class UpdateAllMirrorsWorker # rubocop:disable Scalability/IdempotentWorker
  include ApplicationWorker

-  sidekiq_options retry: 3
  include CronjobQueue

  feature_category :source_code_management

--- a/ee/app/workers/update_max_seats_used_for_gitlab_com_subscriptions_worker.rb
+++ b/ee/app/workers/update_max_seats_used_for_gitlab_com_subscriptions_worker.rb
@@ -5,7 +5,6 @@ class UpdateMaxSeatsUsedForGitlabComSubscriptionsWorker # rubocop:disable Scalab

  data_consistency :always

-  sidekiq_options retry: 3
  include CronjobQueue # rubocop:disable Scalability/CronWorkerContext

  feature_category :utilization

--- a/ee/app/workers/vulnerabilities/historical_statistics/deletion_worker.rb
+++ b/ee/app/workers/vulnerabilities/historical_statistics/deletion_worker.rb
@@ -7,7 +7,6 @@ module Vulnerabilities

      data_consistency :always

-      sidekiq_options retry: 3
      # rubocop:disable Scalability/CronWorkerContext
      # This worker does not perform work scoped to a context
      include CronjobQueue

--- a/ee/app/workers/vulnerabilities/statistics/schedule_worker.rb
+++ b/ee/app/workers/vulnerabilities/statistics/schedule_worker.rb
@@ -7,7 +7,6 @@ module Vulnerabilities

      data_consistency :always

-      sidekiq_options retry: 3
      # rubocop:disable Scalability/CronWorkerContext
      # This worker does not perform work scoped to a context
      include CronjobQueue