diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-01 21:08:09 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-01 21:08:09 +0000 |
| commit | 3902d464d6045c2f5f6b687c0acf3254d7458928 (patch) | |
| tree | 6a814f69362ef173d0a411ce516321aeb91685f7 /app/workers | |
| parent | d7ed3b4766871c30f50736c1d9eedc46c4035841 (diff) | |
| download | gitlab-ce-3902d464d6045c2f5f6b687c0acf3254d7458928.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/workers')
| -rw-r--r-- | app/workers/concerns/project_import_options.rb | 2 | ||||
| -rw-r--r-- | app/workers/stuck_import_jobs_worker.rb | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/app/workers/concerns/project_import_options.rb b/app/workers/concerns/project_import_options.rb index c8ee5539441..4df209da29d 100644 --- a/app/workers/concerns/project_import_options.rb +++ b/app/workers/concerns/project_import_options.rb @@ -6,7 +6,7 @@ module ProjectImportOptions IMPORT_RETRY_COUNT = 5 included do - sidekiq_options retry: IMPORT_RETRY_COUNT, status_expiration: StuckImportJobsWorker::IMPORT_JOBS_EXPIRATION + sidekiq_options retry: IMPORT_RETRY_COUNT, status_expiration: Gitlab::Import::StuckImportJob::IMPORT_JOBS_EXPIRATION # We only want to mark the project as failed once we exhausted all retries sidekiq_retries_exhausted do |job| diff --git a/app/workers/stuck_import_jobs_worker.rb b/app/workers/stuck_import_jobs_worker.rb index 71e8f7a70ec..ce8d5bf0219 100644 --- a/app/workers/stuck_import_jobs_worker.rb +++ b/app/workers/stuck_import_jobs_worker.rb @@ -3,8 +3,6 @@ class StuckImportJobsWorker # rubocop:disable Scalability/IdempotentWorker include Gitlab::Import::StuckImportJob - IMPORT_JOBS_EXPIRATION = Gitlab::Import::StuckImportJob::IMPORT_JOBS_EXPIRATION - private def track_metrics(with_jid_count, without_jid_count) |