diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-07-18 08:07:51 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-07-18 08:07:51 +0000 |
| commit | 1266e2664e7b080b440f5fc004424418284ee87b (patch) | |
| tree | 912460a40f76985a6484a340d8c29e46f5946922 | |
| parent | 31a5a03c6ca9e520694755652e57741765c1e9b0 (diff) | |
| parent | 5ede1331d45199ff1b79d98c70bddda86837de48 (diff) | |
| download | gitlab-ce-1266e2664e7b080b440f5fc004424418284ee87b.tar.gz | |
Merge branch 'fix/import-export-retry-settings' into 'master'
Limit number of project export retries to 3
I think 3 should be a sufficient number of retries - at the moment we were doing 20+
This will only send a maximum of 3 emails if the project export went wrong. Tested - project import is not affected.
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/18966
See merge request !5267
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/workers/project_export_worker.rb | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index 90f006d445d..3b17ea491ce 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -105,6 +105,7 @@ v 8.10.0 (unreleased) - Fix issues importing projects from EE to CE - Fix creating group with space in group path - Create Todos for Issue author when assign or mention himself (Katarzyna Kobierska) + - Limit the number of retries on error to 3 for exporting projects v 8.9.6 - Fix importing of events under notes for GitLab projects. !5154 diff --git a/app/workers/project_export_worker.rb b/app/workers/project_export_worker.rb index 39f6037e077..615311e63f5 100644 --- a/app/workers/project_export_worker.rb +++ b/app/workers/project_export_worker.rb @@ -1,7 +1,7 @@ class ProjectExportWorker include Sidekiq::Worker - sidekiq_options queue: :gitlab_shell, retry: true + sidekiq_options queue: :gitlab_shell, retry: 3 def perform(current_user_id, project_id) current_user = User.find(current_user_id) |