Commit 1266e266 authored by Rémy Coutable's avatar Rémy Coutable

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
parents 31a5a03c 5ede1331
No related merge requests found
......@@ -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
......
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)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment