diff options
Diffstat (limited to 'app/workers/gitlab/github_import/stage')
14 files changed, 0 insertions, 82 deletions
diff --git a/app/workers/gitlab/github_import/stage/finish_import_worker.rb b/app/workers/gitlab/github_import/stage/finish_import_worker.rb index e716eda5c99..90445a6d46c 100644 --- a/app/workers/gitlab/github_import/stage/finish_import_worker.rb +++ b/app/workers/gitlab/github_import/stage/finish_import_worker.rb @@ -8,7 +8,6 @@ module Gitlab data_consistency :always - sidekiq_options retry: 3 include GithubImport::Queue include StageMethods diff --git a/app/workers/gitlab/github_import/stage/import_attachments_worker.rb b/app/workers/gitlab/github_import/stage/import_attachments_worker.rb index 4045852e3f0..f9952f04e99 100644 --- a/app/workers/gitlab/github_import/stage/import_attachments_worker.rb +++ b/app/workers/gitlab/github_import/stage/import_attachments_worker.rb @@ -8,7 +8,6 @@ module Gitlab data_consistency :always - sidekiq_options retry: 5 include GithubImport::Queue include StageMethods diff --git a/app/workers/gitlab/github_import/stage/import_base_data_worker.rb b/app/workers/gitlab/github_import/stage/import_base_data_worker.rb index cc6a2255160..94cb3cb6c71 100644 --- a/app/workers/gitlab/github_import/stage/import_base_data_worker.rb +++ b/app/workers/gitlab/github_import/stage/import_base_data_worker.rb @@ -8,7 +8,6 @@ module Gitlab data_consistency :always - sidekiq_options retry: 3 include GithubImport::Queue include StageMethods @@ -31,22 +30,6 @@ module Gitlab project.import_state.refresh_jid_expiration ImportPullRequestsWorker.perform_async(project.id) - rescue StandardError => e - Gitlab::Import::ImportFailureService.track( - project_id: project.id, - error_source: self.class.name, - exception: e, - fail_import: abort_on_failure, - metrics: true - ) - - raise(e) - end - - private - - def abort_on_failure - true end end end diff --git a/app/workers/gitlab/github_import/stage/import_collaborators_worker.rb b/app/workers/gitlab/github_import/stage/import_collaborators_worker.rb index 8f72cc051b3..751ca92388a 100644 --- a/app/workers/gitlab/github_import/stage/import_collaborators_worker.rb +++ b/app/workers/gitlab/github_import/stage/import_collaborators_worker.rb @@ -8,7 +8,6 @@ module Gitlab data_consistency :always - sidekiq_options retry: 3 include GithubImport::Queue include StageMethods @@ -24,16 +23,6 @@ module Gitlab project.import_state.refresh_jid_expiration move_to_next_stage(project, { waiter.key => waiter.jobs_remaining }) - rescue StandardError => e - Gitlab::Import::ImportFailureService.track( - project_id: project.id, - error_source: self.class.name, - exception: e, - fail_import: abort_on_failure, - metrics: true - ) - - raise(e) end private @@ -58,10 +47,6 @@ module Gitlab project.id, waiters, :pull_requests_merged_by ) end - - def abort_on_failure - true - end end end end diff --git a/app/workers/gitlab/github_import/stage/import_issue_events_worker.rb b/app/workers/gitlab/github_import/stage/import_issue_events_worker.rb index 54ed4c47e78..c80412d941b 100644 --- a/app/workers/gitlab/github_import/stage/import_issue_events_worker.rb +++ b/app/workers/gitlab/github_import/stage/import_issue_events_worker.rb @@ -8,7 +8,6 @@ module Gitlab data_consistency :always - sidekiq_options retry: 3 include GithubImport::Queue include StageMethods diff --git a/app/workers/gitlab/github_import/stage/import_issues_and_diff_notes_worker.rb b/app/workers/gitlab/github_import/stage/import_issues_and_diff_notes_worker.rb index 3d1a8437da2..592b789cc94 100644 --- a/app/workers/gitlab/github_import/stage/import_issues_and_diff_notes_worker.rb +++ b/app/workers/gitlab/github_import/stage/import_issues_and_diff_notes_worker.rb @@ -8,7 +8,6 @@ module Gitlab data_consistency :always - sidekiq_options retry: 3 include GithubImport::Queue include StageMethods diff --git a/app/workers/gitlab/github_import/stage/import_lfs_objects_worker.rb b/app/workers/gitlab/github_import/stage/import_lfs_objects_worker.rb index f6f5687130f..e89a850c991 100644 --- a/app/workers/gitlab/github_import/stage/import_lfs_objects_worker.rb +++ b/app/workers/gitlab/github_import/stage/import_lfs_objects_worker.rb @@ -8,7 +8,6 @@ module Gitlab data_consistency :always - sidekiq_options retry: 3 include GithubImport::Queue include StageMethods diff --git a/app/workers/gitlab/github_import/stage/import_notes_worker.rb b/app/workers/gitlab/github_import/stage/import_notes_worker.rb index 40ca12b130f..c1fdb76d03e 100644 --- a/app/workers/gitlab/github_import/stage/import_notes_worker.rb +++ b/app/workers/gitlab/github_import/stage/import_notes_worker.rb @@ -8,7 +8,6 @@ module Gitlab data_consistency :always - sidekiq_options retry: 3 include GithubImport::Queue include StageMethods diff --git a/app/workers/gitlab/github_import/stage/import_protected_branches_worker.rb b/app/workers/gitlab/github_import/stage/import_protected_branches_worker.rb index 73f4ea580c4..f8448094c28 100644 --- a/app/workers/gitlab/github_import/stage/import_protected_branches_worker.rb +++ b/app/workers/gitlab/github_import/stage/import_protected_branches_worker.rb @@ -8,7 +8,6 @@ module Gitlab data_consistency :always - sidekiq_options retry: 3 include GithubImport::Queue include StageMethods @@ -27,15 +26,6 @@ module Gitlab { waiter.key => waiter.jobs_remaining }, :lfs_objects ) - rescue StandardError => e - Gitlab::Import::ImportFailureService.track( - project_id: project.id, - error_source: self.class.name, - exception: e, - metrics: true - ) - - raise(e) end end end diff --git a/app/workers/gitlab/github_import/stage/import_pull_requests_merged_by_worker.rb b/app/workers/gitlab/github_import/stage/import_pull_requests_merged_by_worker.rb index 329bf8f84b1..2e7cd28578f 100644 --- a/app/workers/gitlab/github_import/stage/import_pull_requests_merged_by_worker.rb +++ b/app/workers/gitlab/github_import/stage/import_pull_requests_merged_by_worker.rb @@ -8,7 +8,6 @@ module Gitlab data_consistency :always - sidekiq_options retry: 3 include GithubImport::Queue include StageMethods diff --git a/app/workers/gitlab/github_import/stage/import_pull_requests_review_requests_worker.rb b/app/workers/gitlab/github_import/stage/import_pull_requests_review_requests_worker.rb index bcbf5dd471a..2f860349e25 100644 --- a/app/workers/gitlab/github_import/stage/import_pull_requests_review_requests_worker.rb +++ b/app/workers/gitlab/github_import/stage/import_pull_requests_review_requests_worker.rb @@ -8,7 +8,6 @@ module Gitlab data_consistency :always - sidekiq_options retry: 3 include GithubImport::Queue include StageMethods diff --git a/app/workers/gitlab/github_import/stage/import_pull_requests_reviews_worker.rb b/app/workers/gitlab/github_import/stage/import_pull_requests_reviews_worker.rb index 33dee47bd03..51730033133 100644 --- a/app/workers/gitlab/github_import/stage/import_pull_requests_reviews_worker.rb +++ b/app/workers/gitlab/github_import/stage/import_pull_requests_reviews_worker.rb @@ -8,7 +8,6 @@ module Gitlab data_consistency :always - sidekiq_options retry: 3 include GithubImport::Queue include StageMethods diff --git a/app/workers/gitlab/github_import/stage/import_pull_requests_worker.rb b/app/workers/gitlab/github_import/stage/import_pull_requests_worker.rb index b2dfded0280..029d38d8b93 100644 --- a/app/workers/gitlab/github_import/stage/import_pull_requests_worker.rb +++ b/app/workers/gitlab/github_import/stage/import_pull_requests_worker.rb @@ -8,7 +8,6 @@ module Gitlab data_consistency :always - sidekiq_options retry: 3 include GithubImport::Queue include StageMethods @@ -33,16 +32,6 @@ module Gitlab { waiter.key => waiter.jobs_remaining }, :collaborators ) - rescue StandardError => e - Gitlab::Import::ImportFailureService.track( - project_id: project.id, - error_source: self.class.name, - exception: e, - fail_import: abort_on_failure, - metrics: true - ) - - raise(e) end private @@ -57,10 +46,6 @@ module Gitlab MergeRequest.track_target_project_iid!(project, last_github_pull_request[:number]) end - - def abort_on_failure - true - end end end end diff --git a/app/workers/gitlab/github_import/stage/import_repository_worker.rb b/app/workers/gitlab/github_import/stage/import_repository_worker.rb index d998771b328..2a62930b5ea 100644 --- a/app/workers/gitlab/github_import/stage/import_repository_worker.rb +++ b/app/workers/gitlab/github_import/stage/import_repository_worker.rb @@ -8,7 +8,6 @@ module Gitlab data_consistency :always - sidekiq_options retry: 3 include GithubImport::Queue include StageMethods @@ -34,17 +33,6 @@ module Gitlab counter.increment ImportBaseDataWorker.perform_async(project.id) - - rescue StandardError => e - Gitlab::Import::ImportFailureService.track( - project_id: project.id, - error_source: self.class.name, - exception: e, - fail_import: abort_on_failure, - metrics: true - ) - - raise(e) end def counter @@ -54,10 +42,6 @@ module Gitlab ) end - def abort_on_failure - true - end - private def allocate_issues_internal_id!(project, client) |