diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-10-04 15:11:58 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-10-04 15:11:58 +0300 |
commit | 0327ce54a7e315b3aa6f80cc4e540fbb6792f2e3 (patch) | |
tree | f27611f4cc36d1aa9215e5bd0ff4787e60e77bd0 /app/workers | |
parent | 266aad4e70f3c642583ab60894b27b2622095cd8 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/workers')
-rw-r--r-- | app/workers/all_queues.yml | 17 | ||||
-rw-r--r-- | app/workers/ci/delete_unit_tests_worker.rb | 2 | ||||
-rw-r--r-- | app/workers/ci/pipeline_artifacts/expire_artifacts_worker.rb | 2 | ||||
-rw-r--r-- | app/workers/expire_build_artifacts_worker.rb | 2 | ||||
-rw-r--r-- | app/workers/expire_build_instance_artifacts_worker.rb | 2 | ||||
-rw-r--r-- | app/workers/packages/debian/generate_distribution_worker.rb | 2 | ||||
-rw-r--r-- | app/workers/pages_remove_worker.rb | 16 | ||||
-rw-r--r-- | app/workers/stuck_ci_jobs_worker.rb | 8 |
8 files changed, 14 insertions, 37 deletions
diff --git a/app/workers/all_queues.yml b/app/workers/all_queues.yml index 1c294ea9204..802697b66e1 100644 --- a/app/workers/all_queues.yml +++ b/app/workers/all_queues.yml @@ -194,7 +194,7 @@ :tags: [] - :name: cronjob:ci_delete_unit_tests :worker_name: Ci::DeleteUnitTestsWorker - :feature_category: :continuous_integration + :feature_category: :code_testing :has_external_dependencies: :urgency: :low :resource_boundary: :unknown @@ -203,7 +203,7 @@ :tags: [] - :name: cronjob:ci_pipeline_artifacts_expire_artifacts :worker_name: Ci::PipelineArtifacts::ExpireArtifactsWorker - :feature_category: :continuous_integration + :feature_category: :build_artifacts :has_external_dependencies: :urgency: :low :resource_boundary: :unknown @@ -302,7 +302,7 @@ :tags: [] - :name: cronjob:expire_build_artifacts :worker_name: ExpireBuildArtifactsWorker - :feature_category: :continuous_integration + :feature_category: :build_artifacts :has_external_dependencies: :urgency: :low :resource_boundary: :unknown @@ -2098,7 +2098,7 @@ :tags: [] - :name: expire_build_instance_artifacts :worker_name: ExpireBuildInstanceArtifactsWorker - :feature_category: :continuous_integration + :feature_category: :build_artifacts :has_external_dependencies: :urgency: :low :resource_boundary: :unknown @@ -2465,15 +2465,6 @@ :weight: 1 :idempotent: :tags: [] -- :name: pages_remove - :worker_name: PagesRemoveWorker - :feature_category: :pages - :has_external_dependencies: - :urgency: :low - :resource_boundary: :unknown - :weight: 1 - :idempotent: - :tags: [] - :name: pages_transfer :worker_name: PagesTransferWorker :feature_category: :pages diff --git a/app/workers/ci/delete_unit_tests_worker.rb b/app/workers/ci/delete_unit_tests_worker.rb index d5bb72ce80c..01d909773d2 100644 --- a/app/workers/ci/delete_unit_tests_worker.rb +++ b/app/workers/ci/delete_unit_tests_worker.rb @@ -10,7 +10,7 @@ module Ci include CronjobQueue # rubocop:enable Scalability/CronWorkerContext - feature_category :continuous_integration + feature_category :code_testing idempotent! def perform diff --git a/app/workers/ci/pipeline_artifacts/expire_artifacts_worker.rb b/app/workers/ci/pipeline_artifacts/expire_artifacts_worker.rb index 2af07cf6f93..cde3d71286e 100644 --- a/app/workers/ci/pipeline_artifacts/expire_artifacts_worker.rb +++ b/app/workers/ci/pipeline_artifacts/expire_artifacts_worker.rb @@ -14,7 +14,7 @@ module Ci deduplicate :until_executed, including_scheduled: true idempotent! - feature_category :continuous_integration + feature_category :build_artifacts def perform service = ::Ci::PipelineArtifacts::DestroyAllExpiredService.new diff --git a/app/workers/expire_build_artifacts_worker.rb b/app/workers/expire_build_artifacts_worker.rb index 65d387f73ed..295703cc1c3 100644 --- a/app/workers/expire_build_artifacts_worker.rb +++ b/app/workers/expire_build_artifacts_worker.rb @@ -10,7 +10,7 @@ class ExpireBuildArtifactsWorker # rubocop:disable Scalability/IdempotentWorker include CronjobQueue # rubocop:enable Scalability/CronWorkerContext - feature_category :continuous_integration + feature_category :build_artifacts def perform service = Ci::JobArtifacts::DestroyAllExpiredService.new diff --git a/app/workers/expire_build_instance_artifacts_worker.rb b/app/workers/expire_build_instance_artifacts_worker.rb index 96378acca08..77b8f59e365 100644 --- a/app/workers/expire_build_instance_artifacts_worker.rb +++ b/app/workers/expire_build_instance_artifacts_worker.rb @@ -7,7 +7,7 @@ class ExpireBuildInstanceArtifactsWorker # rubocop:disable Scalability/Idempoten sidekiq_options retry: 3 - feature_category :continuous_integration + feature_category :build_artifacts # rubocop: disable CodeReuse/ActiveRecord def perform(build_id) diff --git a/app/workers/packages/debian/generate_distribution_worker.rb b/app/workers/packages/debian/generate_distribution_worker.rb index b9b157d25d2..1eff3ea02dd 100644 --- a/app/workers/packages/debian/generate_distribution_worker.rb +++ b/app/workers/packages/debian/generate_distribution_worker.rb @@ -2,7 +2,7 @@ module Packages module Debian - class GenerateDistributionWorker # rubocop:disable Scalability/IdempotentWorker + class GenerateDistributionWorker include ApplicationWorker data_consistency :always diff --git a/app/workers/pages_remove_worker.rb b/app/workers/pages_remove_worker.rb deleted file mode 100644 index 4de99b8654d..00000000000 --- a/app/workers/pages_remove_worker.rb +++ /dev/null @@ -1,16 +0,0 @@ -# frozen_string_literal: true - -# TODO: remove this worker https://gitlab.com/gitlab-org/gitlab/-/issues/340641 -class PagesRemoveWorker # rubocop:disable Scalability/IdempotentWorker - include ApplicationWorker - - data_consistency :always - - sidekiq_options retry: 3 - feature_category :pages - loggable_arguments 0 - - def perform(project_id) - # no-op - end -end diff --git a/app/workers/stuck_ci_jobs_worker.rb b/app/workers/stuck_ci_jobs_worker.rb index 20bc201f5f0..d87e866d8a7 100644 --- a/app/workers/stuck_ci_jobs_worker.rb +++ b/app/workers/stuck_ci_jobs_worker.rb @@ -21,9 +21,11 @@ class StuckCiJobsWorker # rubocop:disable Scalability/IdempotentWorker return unless try_obtain_lease - Ci::StuckBuilds::DropService.new.execute - - remove_lease + begin + Ci::StuckBuilds::DropService.new.execute + ensure + remove_lease + end end private |