Merge branch 'jts/fix-io-tag' into 'master'

Removes the Disk IO tag from various queues See merge request gitlab-org/gitlab!56145

Merge branch 'jts/fix-io-tag' into 'master'
Removes the Disk IO tag from various queues See merge request gitlab-org/gitlab!56145
c828bbf7 · Sean McGivern · 152c03af · 215e48ac · c828bbf7 · c828bbf7
Commit c828bbf7 authored Mar 10, 2021 by Sean McGivern
9 changed files
--- a/app/workers/all_queues.yml
+++ b/app/workers/all_queues.yml
@@ -1106,8 +1106,7 @@
  :resource_boundary: :unknown
  :weight: 1
  :idempotent:
-  :tags:
-  - :requires_disk_io
+  :tags: []
 - :name: pipeline_background:ci_build_trace_chunk_flush
  :feature_category: :continuous_integration
  :has_external_dependencies:
@@ -1251,8 +1250,7 @@
  :resource_boundary: :cpu
  :weight: 5
  :idempotent:
-  :tags:
-  - :requires_disk_io
+  :tags: []
 - :name: pipeline_processing:build_queue
  :feature_category: :continuous_integration
  :has_external_dependencies:
@@ -1484,8 +1482,7 @@
  :resource_boundary: :unknown
  :weight: 2
  :idempotent:
-  :tags:
-  - :requires_disk_io
+  :tags: []
 - :name: ci_delete_objects
  :feature_category: :continuous_integration
  :has_external_dependencies:
@@ -1645,8 +1642,7 @@
  :resource_boundary: :unknown
  :weight: 1
  :idempotent:
-  :tags:
-  - :requires_disk_io
+  :tags: []
 - :name: export_csv
  :feature_category: :issue_tracking
  :has_external_dependencies:

--- a/app/workers/archive_trace_worker.rb
+++ b/app/workers/archive_trace_worker.rb
@@ -4,8 +4,6 @@ class ArchiveTraceWorker # rubocop:disable Scalability/IdempotentWorker
  include ApplicationWorker
  include PipelineBackgroundQueue

-  tags :requires_disk_io
-
  # rubocop: disable CodeReuse/ActiveRecord
  def perform(job_id)
    Ci::Build.without_archived_trace.find_by(id: job_id).try do |job|

--- a/app/workers/build_finished_worker.rb
+++ b/app/workers/build_finished_worker.rb
@@ -7,7 +7,6 @@ class BuildFinishedWorker # rubocop:disable Scalability/IdempotentWorker
  queue_namespace :pipeline_processing
  urgency :high
  worker_resource_boundary :cpu
-  tags :requires_disk_io

  ARCHIVE_TRACES_IN = 2.minutes.freeze


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

  sidekiq_options retry: false
  feature_category :chatops
-  tags :requires_disk_io
  urgency :low # Can't be high as it has external dependencies
  weight 2
  worker_has_external_dependencies!

--- a/app/workers/expire_build_instance_artifacts_worker.rb
+++ b/app/workers/expire_build_instance_artifacts_worker.rb
@@ -4,7 +4,6 @@ class ExpireBuildInstanceArtifactsWorker # rubocop:disable Scalability/Idempoten
  include ApplicationWorker

  feature_category :continuous_integration
-  tags :requires_disk_io

  # rubocop: disable CodeReuse/ActiveRecord
  def perform(build_id)

--- a/ee/app/workers/all_queues.yml
+++ b/ee/app/workers/all_queues.yml
@@ -626,8 +626,7 @@
  :resource_boundary: :unknown
  :weight: 2
  :idempotent:
-  :tags:
-  - :requires_disk_io
+  :tags: []
 - :name: security_scans:store_security_scans
  :feature_category: :static_application_security_testing
  :has_external_dependencies:
@@ -635,8 +634,7 @@
  :resource_boundary: :unknown
  :weight: 2
  :idempotent:
-  :tags:
-  - :requires_disk_io
+  :tags: []
 - :name: security_scans:sync_security_reports_to_report_approval_rules
  :feature_category: :static_application_security_testing
  :has_external_dependencies:
@@ -908,8 +906,7 @@
  :resource_boundary: :unknown
  :weight: 1
  :idempotent: true
-  :tags:
-  - :requires_disk_io
+  :tags: []
 - :name: security_auto_fix
  :feature_category: :vulnerability_management
  :has_external_dependencies:

--- a/ee/app/workers/requirements_management/process_requirements_reports_worker.rb
+++ b/ee/app/workers/requirements_management/process_requirements_reports_worker.rb
@@ -6,7 +6,6 @@ module RequirementsManagement

    feature_category :requirements_management
    idempotent!
-    tags :requires_disk_io

    def perform(build_id)
      ::Ci::Build.find_by_id(build_id).try do |build|

--- a/ee/app/workers/store_security_reports_worker.rb
+++ b/ee/app/workers/store_security_reports_worker.rb
@@ -6,8 +6,6 @@ class StoreSecurityReportsWorker # rubocop:disable Scalability/IdempotentWorker
  include ApplicationWorker
  include SecurityScansQueue

-  tags :requires_disk_io
-
  def perform(pipeline_id)
    Ci::Pipeline.find(pipeline_id).try do |pipeline|
      break unless pipeline.project.can_store_security_reports?

--- a/ee/app/workers/store_security_scans_worker.rb
+++ b/ee/app/workers/store_security_scans_worker.rb
@@ -4,8 +4,6 @@ class StoreSecurityScansWorker # rubocop:disable Scalability/IdempotentWorker
  include ApplicationWorker
  include SecurityScansQueue

-  tags :requires_disk_io
-
  # rubocop: disable CodeReuse/ActiveRecord
  def perform(*)
    # no-op