diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-29 18:08:57 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-29 18:08:57 +0000 |
commit | aa99514d5c37e08c0fa49d03212ccdc943b8d31e (patch) | |
tree | c67201d92846b800995fc771c54760d0bf9ce0ae /app/workers | |
parent | 3aaaf9cd8ecda9552407ffd59e52403696133bab (diff) | |
download | gitlab-ce-aa99514d5c37e08c0fa49d03212ccdc943b8d31e.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/workers')
-rw-r--r-- | app/workers/all_queues.yml | 8 | ||||
-rw-r--r-- | app/workers/stuck_import_jobs_worker.rb | 19 |
2 files changed, 0 insertions, 27 deletions
diff --git a/app/workers/all_queues.yml b/app/workers/all_queues.yml index d9f6139beb6..64d27affd2c 100644 --- a/app/workers/all_queues.yml +++ b/app/workers/all_queues.yml @@ -339,14 +339,6 @@ :weight: 1 :idempotent: :tags: [] -- :name: cronjob:stuck_import_jobs - :feature_category: :importers - :has_external_dependencies: - :urgency: :low - :resource_boundary: :cpu - :weight: 1 - :idempotent: - :tags: [] - :name: cronjob:stuck_merge_jobs :feature_category: :source_code_management :has_external_dependencies: diff --git a/app/workers/stuck_import_jobs_worker.rb b/app/workers/stuck_import_jobs_worker.rb deleted file mode 100644 index ce8d5bf0219..00000000000 --- a/app/workers/stuck_import_jobs_worker.rb +++ /dev/null @@ -1,19 +0,0 @@ -# frozen_string_literal: true - -class StuckImportJobsWorker # rubocop:disable Scalability/IdempotentWorker - include Gitlab::Import::StuckImportJob - - private - - def track_metrics(with_jid_count, without_jid_count) - Gitlab::Metrics.add_event( - :stuck_import_jobs, - projects_without_jid_count: without_jid_count, - projects_with_jid_count: with_jid_count - ) - end - - def enqueued_import_states - ProjectImportState.with_status([:scheduled, :started]) - end -end |