Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding retries for failed copy_blob() calls in system tests. #2290

Merged
merged 1 commit into from
Sep 9, 2016
Merged

Adding retries for failed copy_blob() calls in system tests. #2290

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 18 additions & 4 deletions system_tests/storage.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,21 @@
from retry import RetryResult


retry_429 = RetryErrors(exceptions.TooManyRequests)
HTTP = httplib2.Http()


def _bad_copy(bad_request):
"""Predicate: pass only exceptions for a failed copyTo."""
err_msg = bad_request.message
return (err_msg.startswith('No file found in request. (POST') and
'copyTo' in err_msg)

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view



retry_429 = RetryErrors(exceptions.TooManyRequests)
retry_bad_copy = RetryErrors(exceptions.BadRequest,
error_predicate=_bad_copy)


class Config(object):
"""Run-time configuration to be modified at set-up.

Expand Down Expand Up @@ -188,7 +199,8 @@ def test_copy_existing_file(self):
blob.upload_from_filename(filename)
self.case_blobs_to_delete.append(blob)

new_blob = self.bucket.copy_blob(blob, self.bucket, 'CloudLogoCopy')
new_blob = retry_bad_copy(self.bucket.copy_blob)(
blob, self.bucket, 'CloudLogoCopy')
self.case_blobs_to_delete.append(new_blob)

base_contents = blob.download_as_string()
Expand All @@ -214,7 +226,8 @@ def setUpClass(cls):

# Copy main blob onto remaining in FILENAMES.
for filename in cls.FILENAMES[1:]:
new_blob = cls.bucket.copy_blob(blob, cls.bucket, filename)
new_blob = retry_bad_copy(cls.bucket.copy_blob)(
blob, cls.bucket, filename)
cls.suite_blobs_to_delete.append(new_blob)

@classmethod
Expand Down Expand Up @@ -275,7 +288,8 @@ def setUpClass(cls):
blob.upload_from_filename(simple_path)
cls.suite_blobs_to_delete = [blob]
for filename in cls.FILENAMES[1:]:
new_blob = cls.bucket.copy_blob(blob, cls.bucket, filename)
new_blob = retry_bad_copy(cls.bucket.copy_blob)(
blob, cls.bucket, filename)
cls.suite_blobs_to_delete.append(new_blob)

@classmethod
Expand Down