Commit 9cbbfab1 authored by Sean McGivern's avatar Sean McGivern

Merge branch 'jts/note-nfs-required-queues' into 'master'

Mark sidekiq queues that require local shared disk access

See merge request gitlab-org/gitlab!44504
parents cbe32014 ee37dd26
...@@ -946,7 +946,8 @@ ...@@ -946,7 +946,8 @@
:resource_boundary: :unknown :resource_boundary: :unknown
:weight: 1 :weight: 1
:idempotent: :idempotent:
:tags: [] :tags:
- :requires_disk_io
- :name: pipeline_background:ci_build_report_result - :name: pipeline_background:ci_build_report_result
:feature_category: :continuous_integration :feature_category: :continuous_integration
:has_external_dependencies: :has_external_dependencies:
...@@ -954,7 +955,8 @@ ...@@ -954,7 +955,8 @@
:resource_boundary: :unknown :resource_boundary: :unknown
:weight: 1 :weight: 1
:idempotent: true :idempotent: true
:tags: [] :tags:
- :requires_disk_io
- :name: pipeline_background:ci_build_trace_chunk_flush - :name: pipeline_background:ci_build_trace_chunk_flush
:feature_category: :continuous_integration :feature_category: :continuous_integration
:has_external_dependencies: :has_external_dependencies:
...@@ -1034,7 +1036,8 @@ ...@@ -1034,7 +1036,8 @@
:resource_boundary: :unknown :resource_boundary: :unknown
:weight: 3 :weight: 3
:idempotent: :idempotent:
:tags: [] :tags:
- :requires_disk_io
- :name: pipeline_default:build_trace_sections - :name: pipeline_default:build_trace_sections
:feature_category: :continuous_integration :feature_category: :continuous_integration
:has_external_dependencies: :has_external_dependencies:
...@@ -1042,7 +1045,8 @@ ...@@ -1042,7 +1045,8 @@
:resource_boundary: :unknown :resource_boundary: :unknown
:weight: 3 :weight: 3
:idempotent: :idempotent:
:tags: [] :tags:
- :requires_disk_io
- :name: pipeline_default:ci_create_cross_project_pipeline - :name: pipeline_default:ci_create_cross_project_pipeline
:feature_category: :continuous_integration :feature_category: :continuous_integration
:has_external_dependencies: :has_external_dependencies:
...@@ -1299,7 +1303,8 @@ ...@@ -1299,7 +1303,8 @@
:resource_boundary: :unknown :resource_boundary: :unknown
:weight: 2 :weight: 2
:idempotent: :idempotent:
:tags: [] :tags:
- :requires_disk_io
- :name: create_commit_signature - :name: create_commit_signature
:feature_category: :source_code_management :feature_category: :source_code_management
:has_external_dependencies: :has_external_dependencies:
...@@ -1419,7 +1424,8 @@ ...@@ -1419,7 +1424,8 @@
:resource_boundary: :unknown :resource_boundary: :unknown
:weight: 1 :weight: 1
:idempotent: :idempotent:
:tags: [] :tags:
- :requires_disk_io
- :name: export_csv - :name: export_csv
:feature_category: :issue_tracking :feature_category: :issue_tracking
:has_external_dependencies: :has_external_dependencies:
...@@ -1483,7 +1489,8 @@ ...@@ -1483,7 +1489,8 @@
:resource_boundary: :unknown :resource_boundary: :unknown
:weight: 1 :weight: 1
:idempotent: :idempotent:
:tags: [] :tags:
- :requires_disk_io
- :name: group_export - :name: group_export
:feature_category: :importers :feature_category: :importers
:has_external_dependencies: :has_external_dependencies:
...@@ -1635,7 +1642,8 @@ ...@@ -1635,7 +1642,8 @@
:resource_boundary: :unknown :resource_boundary: :unknown
:weight: 1 :weight: 1
:idempotent: :idempotent:
:tags: [] :tags:
- :requires_disk_io
- :name: pages_domain_ssl_renewal - :name: pages_domain_ssl_renewal
:feature_category: :pages :feature_category: :pages
:has_external_dependencies: :has_external_dependencies:
...@@ -1643,7 +1651,8 @@ ...@@ -1643,7 +1651,8 @@
:resource_boundary: :unknown :resource_boundary: :unknown
:weight: 1 :weight: 1
:idempotent: :idempotent:
:tags: [] :tags:
- :requires_disk_io
- :name: pages_domain_verification - :name: pages_domain_verification
:feature_category: :pages :feature_category: :pages
:has_external_dependencies: :has_external_dependencies:
...@@ -1651,7 +1660,8 @@ ...@@ -1651,7 +1660,8 @@
:resource_boundary: :unknown :resource_boundary: :unknown
:weight: 1 :weight: 1
:idempotent: :idempotent:
:tags: [] :tags:
- :requires_disk_io
- :name: pages_remove - :name: pages_remove
:feature_category: :pages :feature_category: :pages
:has_external_dependencies: :has_external_dependencies:
...@@ -1723,7 +1733,8 @@ ...@@ -1723,7 +1733,8 @@
:resource_boundary: :unknown :resource_boundary: :unknown
:weight: 1 :weight: 1
:idempotent: :idempotent:
:tags: [] :tags:
- :requires_disk_io
- :name: project_export - :name: project_export
:feature_category: :importers :feature_category: :importers
:has_external_dependencies: :has_external_dependencies:
......
...@@ -4,6 +4,8 @@ class ArchiveTraceWorker # rubocop:disable Scalability/IdempotentWorker ...@@ -4,6 +4,8 @@ class ArchiveTraceWorker # rubocop:disable Scalability/IdempotentWorker
include ApplicationWorker include ApplicationWorker
include PipelineBackgroundQueue include PipelineBackgroundQueue
tags :requires_disk_io
# rubocop: disable CodeReuse/ActiveRecord # rubocop: disable CodeReuse/ActiveRecord
def perform(job_id) def perform(job_id)
Ci::Build.without_archived_trace.find_by(id: job_id).try do |job| Ci::Build.without_archived_trace.find_by(id: job_id).try do |job|
......
...@@ -4,6 +4,8 @@ class BuildCoverageWorker # rubocop:disable Scalability/IdempotentWorker ...@@ -4,6 +4,8 @@ class BuildCoverageWorker # rubocop:disable Scalability/IdempotentWorker
include ApplicationWorker include ApplicationWorker
include PipelineQueue include PipelineQueue
tags :requires_disk_io
# rubocop: disable CodeReuse/ActiveRecord # rubocop: disable CodeReuse/ActiveRecord
def perform(build_id) def perform(build_id)
Ci::Build.find_by(id: build_id)&.update_coverage Ci::Build.find_by(id: build_id)&.update_coverage
......
...@@ -4,6 +4,8 @@ class BuildTraceSectionsWorker # rubocop:disable Scalability/IdempotentWorker ...@@ -4,6 +4,8 @@ class BuildTraceSectionsWorker # rubocop:disable Scalability/IdempotentWorker
include ApplicationWorker include ApplicationWorker
include PipelineQueue include PipelineQueue
tags :requires_disk_io
# rubocop: disable CodeReuse/ActiveRecord # rubocop: disable CodeReuse/ActiveRecord
def perform(build_id) def perform(build_id)
Ci::Build.find_by(id: build_id)&.parse_trace_sections! Ci::Build.find_by(id: build_id)&.parse_trace_sections!
......
...@@ -7,6 +7,7 @@ class ChatNotificationWorker # rubocop:disable Scalability/IdempotentWorker ...@@ -7,6 +7,7 @@ class ChatNotificationWorker # rubocop:disable Scalability/IdempotentWorker
sidekiq_options retry: false sidekiq_options retry: false
feature_category :chatops feature_category :chatops
tags :requires_disk_io
urgency :low # Can't be high as it has external dependencies urgency :low # Can't be high as it has external dependencies
weight 2 weight 2
worker_has_external_dependencies! worker_has_external_dependencies!
......
...@@ -5,6 +5,8 @@ module Ci ...@@ -5,6 +5,8 @@ module Ci
include ApplicationWorker include ApplicationWorker
include PipelineBackgroundQueue include PipelineBackgroundQueue
tags :requires_disk_io
idempotent! idempotent!
def perform(build_id) def perform(build_id)
......
...@@ -4,6 +4,7 @@ class ExpireBuildInstanceArtifactsWorker # rubocop:disable Scalability/Idempoten ...@@ -4,6 +4,7 @@ class ExpireBuildInstanceArtifactsWorker # rubocop:disable Scalability/Idempoten
include ApplicationWorker include ApplicationWorker
feature_category :continuous_integration feature_category :continuous_integration
tags :requires_disk_io
# rubocop: disable CodeReuse/ActiveRecord # rubocop: disable CodeReuse/ActiveRecord
def perform(build_id) def perform(build_id)
......
...@@ -5,6 +5,7 @@ class GroupDestroyWorker # rubocop:disable Scalability/IdempotentWorker ...@@ -5,6 +5,7 @@ class GroupDestroyWorker # rubocop:disable Scalability/IdempotentWorker
include ExceptionBacktrace include ExceptionBacktrace
feature_category :subgroups feature_category :subgroups
tags :requires_disk_io
def perform(group_id, user_id) def perform(group_id, user_id)
begin begin
......
...@@ -4,6 +4,7 @@ class PagesDomainSslRenewalWorker # rubocop:disable Scalability/IdempotentWorker ...@@ -4,6 +4,7 @@ class PagesDomainSslRenewalWorker # rubocop:disable Scalability/IdempotentWorker
include ApplicationWorker include ApplicationWorker
feature_category :pages feature_category :pages
tags :requires_disk_io
def perform(domain_id) def perform(domain_id)
domain = PagesDomain.find_by_id(domain_id) domain = PagesDomain.find_by_id(domain_id)
......
...@@ -4,6 +4,7 @@ class PagesDomainVerificationWorker # rubocop:disable Scalability/IdempotentWork ...@@ -4,6 +4,7 @@ class PagesDomainVerificationWorker # rubocop:disable Scalability/IdempotentWork
include ApplicationWorker include ApplicationWorker
feature_category :pages feature_category :pages
tags :requires_disk_io
# rubocop: disable CodeReuse/ActiveRecord # rubocop: disable CodeReuse/ActiveRecord
def perform(domain_id) def perform(domain_id)
......
...@@ -6,6 +6,7 @@ class PagesWorker # rubocop:disable Scalability/IdempotentWorker ...@@ -6,6 +6,7 @@ class PagesWorker # rubocop:disable Scalability/IdempotentWorker
sidekiq_options retry: 3 sidekiq_options retry: 3
feature_category :pages feature_category :pages
loggable_arguments 0, 1 loggable_arguments 0, 1
tags :requires_disk_io
def perform(action, *arg) def perform(action, *arg)
send(action, *arg) # rubocop:disable GitlabSecurity/PublicSend send(action, *arg) # rubocop:disable GitlabSecurity/PublicSend
......
...@@ -5,6 +5,7 @@ class ProjectDestroyWorker # rubocop:disable Scalability/IdempotentWorker ...@@ -5,6 +5,7 @@ class ProjectDestroyWorker # rubocop:disable Scalability/IdempotentWorker
include ExceptionBacktrace include ExceptionBacktrace
feature_category :source_code_management feature_category :source_code_management
tags :requires_disk_io
def perform(project_id, user_id, params) def perform(project_id, user_id, params)
project = Project.find(project_id) project = Project.find(project_id)
......
...@@ -522,7 +522,8 @@ ...@@ -522,7 +522,8 @@
:resource_boundary: :unknown :resource_boundary: :unknown
:weight: 2 :weight: 2
:idempotent: :idempotent:
:tags: [] :tags:
- :requires_disk_io
- :name: security_scans:store_security_scans - :name: security_scans:store_security_scans
:feature_category: :static_application_security_testing :feature_category: :static_application_security_testing
:has_external_dependencies: :has_external_dependencies:
...@@ -530,7 +531,8 @@ ...@@ -530,7 +531,8 @@
:resource_boundary: :unknown :resource_boundary: :unknown
:weight: 2 :weight: 2
:idempotent: :idempotent:
:tags: [] :tags:
- :requires_disk_io
- :name: security_scans:sync_security_reports_to_report_approval_rules - :name: security_scans:sync_security_reports_to_report_approval_rules
:feature_category: :static_application_security_testing :feature_category: :static_application_security_testing
:has_external_dependencies: :has_external_dependencies:
...@@ -706,7 +708,8 @@ ...@@ -706,7 +708,8 @@
:resource_boundary: :unknown :resource_boundary: :unknown
:weight: 1 :weight: 1
:idempotent: true :idempotent: true
:tags: [] :tags:
- :requires_disk_io
- :name: status_page_publish - :name: status_page_publish
:feature_category: :incident_management :feature_category: :incident_management
:has_external_dependencies: true :has_external_dependencies: true
......
...@@ -6,6 +6,7 @@ module RequirementsManagement ...@@ -6,6 +6,7 @@ module RequirementsManagement
feature_category :requirements_management feature_category :requirements_management
idempotent! idempotent!
tags :requires_disk_io
def perform(build_id) def perform(build_id)
::Ci::Build.find_by_id(build_id).try do |build| ::Ci::Build.find_by_id(build_id).try do |build|
......
...@@ -6,6 +6,8 @@ class StoreSecurityReportsWorker # rubocop:disable Scalability/IdempotentWorker ...@@ -6,6 +6,8 @@ class StoreSecurityReportsWorker # rubocop:disable Scalability/IdempotentWorker
include ApplicationWorker include ApplicationWorker
include SecurityScansQueue include SecurityScansQueue
tags :requires_disk_io
def perform(pipeline_id) def perform(pipeline_id)
Ci::Pipeline.find(pipeline_id).try do |pipeline| Ci::Pipeline.find(pipeline_id).try do |pipeline|
break unless pipeline.project.can_store_security_reports? break unless pipeline.project.can_store_security_reports?
......
...@@ -4,6 +4,8 @@ class StoreSecurityScansWorker # rubocop:disable Scalability/IdempotentWorker ...@@ -4,6 +4,8 @@ class StoreSecurityScansWorker # rubocop:disable Scalability/IdempotentWorker
include ApplicationWorker include ApplicationWorker
include SecurityScansQueue include SecurityScansQueue
tags :requires_disk_io
# rubocop: disable CodeReuse/ActiveRecord # rubocop: disable CodeReuse/ActiveRecord
def perform(build_id) def perform(build_id)
::Ci::Build.find_by(id: build_id).try do |build| ::Ci::Build.find_by(id: build_id).try do |build|
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment