diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-16 06:08:29 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-16 06:08:29 +0300 |
| commit | c311ce331fcfe1c1f1619534eb746245a1deb326 (patch) | |
| tree | 70974544b6f670f909fecfe0052851bf570e866c /app/workers | |
| parent | 3682a3a317e423498bfe56c38d21c6381b8ad04b (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/workers')
| -rw-r--r-- | app/workers/group_export_worker.rb | 2 | ||||
| -rw-r--r-- | app/workers/group_import_worker.rb | 2 | ||||
| -rw-r--r-- | app/workers/project_export_worker.rb | 2 | ||||
| -rw-r--r-- | app/workers/repository_import_worker.rb | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/app/workers/group_export_worker.rb b/app/workers/group_export_worker.rb index e22b691d35e..a212147d8fd 100644 --- a/app/workers/group_export_worker.rb +++ b/app/workers/group_export_worker.rb @@ -6,7 +6,7 @@ class GroupExportWorker # rubocop:disable Scalability/IdempotentWorker feature_category :importers loggable_arguments 2 - sidekiq_options retry: false + sidekiq_options retry: false, dead: false def perform(current_user_id, group_id, params = {}) current_user = User.find(current_user_id) diff --git a/app/workers/group_import_worker.rb b/app/workers/group_import_worker.rb index 494d9a3e46f..b8b596f459b 100644 --- a/app/workers/group_import_worker.rb +++ b/app/workers/group_import_worker.rb @@ -3,7 +3,7 @@ class GroupImportWorker # rubocop:disable Scalability/IdempotentWorker include ApplicationWorker - sidekiq_options retry: false + sidekiq_options retry: false, dead: false feature_category :importers def perform(user_id, group_id) diff --git a/app/workers/project_export_worker.rb b/app/workers/project_export_worker.rb index 6c8640138a1..1c4aa3f7e49 100644 --- a/app/workers/project_export_worker.rb +++ b/app/workers/project_export_worker.rb @@ -8,7 +8,7 @@ class ProjectExportWorker # rubocop:disable Scalability/IdempotentWorker worker_resource_boundary :memory urgency :throttled loggable_arguments 2, 3 - sidekiq_options retry: false + sidekiq_options retry: false, dead: false sidekiq_options status_expiration: StuckExportJobsWorker::EXPORT_JOBS_EXPIRATION def perform(current_user_id, project_id, after_export_strategy = {}, params = {}) diff --git a/app/workers/repository_import_worker.rb b/app/workers/repository_import_worker.rb index 85f1a1fa767..51fe60e25fc 100644 --- a/app/workers/repository_import_worker.rb +++ b/app/workers/repository_import_worker.rb @@ -8,7 +8,7 @@ class RepositoryImportWorker # rubocop:disable Scalability/IdempotentWorker feature_category :importers worker_has_external_dependencies! # Do not retry on Import/Export until https://gitlab.com/gitlab-org/gitlab/-/issues/16812 is solved. - sidekiq_options retry: false + sidekiq_options retry: false, dead: false sidekiq_options status_expiration: Gitlab::Import::StuckImportJob::IMPORT_JOBS_EXPIRATION # technical debt: https://gitlab.com/gitlab-org/gitlab/issues/33991 |