Add back support for retries in storage uploads. #3378
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
googlebot
added
the
cla: yes
|
Was #3375 |
|
@tseaver @lukesneeringer Can I get a review here? |
tseaver
reviewed
May 9, 2017
| @@ -631,13 +637,19 @@ def _do_multipart_upload(self, client, stream, content_type, size): | |||
| upload_url = _MULTIPART_URL_TEMPLATE.format( | |||
| bucket_path=self.bucket.path) | |||
| upload = MultipartUpload(upload_url, headers=headers) | |||
|
|
|||
| if num_retries is not None: | |||
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
| @@ -693,13 +709,19 @@ def _initiate_resumable_upload(self, client, stream, content_type, | |||
| upload_url = _RESUMABLE_URL_TEMPLATE.format( | |||
| bucket_path=self.bucket.path) | |||
| upload = ResumableUpload(upload_url, chunk_size, headers=headers) | |||
|
|
|||
| if num_retries is not None: | |||
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
| @@ -817,6 +818,11 @@ def test__do_multipart_upload_no_size(self, mock_get_boundary): | |||
| def test__do_multipart_upload_with_size(self, mock_get_boundary): | |||
| self._do_multipart_success(mock_get_boundary, size=10) | |||
|
|
|||
| @mock.patch(u'google.resumable_media._upload.get_boundary', | |||
| return_value=b'==0==') | |||
| def test__do_multipart_upload_with_retry(self, mock_get_boundary): | |||
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
lukesneeringer
approved these changes
May 10, 2017
This was referenced Jun 26, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.