diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-12-06 15:11:09 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-12-06 15:11:09 +0300 |
| commit | e9aabbc4b5c80a569ce7e5909bd9d8def11b7a1b (patch) | |
| tree | 2bc9ed254deba51c4041c1ee2fb8dcc7bd3dfaad /app/services | |
| parent | 08608c8e9e9821858dd2f452a3c9ebfb945ab69f (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services')
| -rw-r--r-- | app/services/bulk_imports/file_download_service.rb | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/app/services/bulk_imports/file_download_service.rb b/app/services/bulk_imports/file_download_service.rb index 321e6b3783e..8f72c35a94c 100644 --- a/app/services/bulk_imports/file_download_service.rb +++ b/app/services/bulk_imports/file_download_service.rb @@ -58,6 +58,13 @@ module BulkImports http_client.stream(relative_url) do |chunk| next if bytes_downloaded == 0 && [301, 302, 303, 307, 308].include?(chunk.code) + if BulkImports::NetworkError::RETRIABLE_HTTP_CODES.include?(chunk.code) + raise BulkImports::NetworkError.new( + "Error downloading file from #{relative_url}. Error code: #{chunk.code}", + response: chunk.http_response + ) + end + @response_code = chunk.code @response_headers ||= Gitlab::HTTP::Response::Headers.new(chunk.http_response.to_hash) @last_chunk_context = chunk.to_s.truncate(LAST_CHUNK_CONTEXT_CHAR_LIMIT) |