Skip to content

fix: add ConnectionError to default retry #445

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

Merged
gcf-merge-on-green merged 8 commits into from
May 20, 2021
Merged

fix: add ConnectionError to default retry #445

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
79c29d5
fix: add ConnectionError to default retry
cojenco May 14, 2021
67c2b22
add _RETRYABLE_STDLIB_TYPES to address ConnectionError not in python2
cojenco May 18, 2021
4477757
add test for ConnectionError default retries
cojenco May 18, 2021
e7cc759
rename test_miss_w_stdlib_error and update test_w_requests_connection…
cojenco May 19, 2021
c37d6bb
chore(deps): update precommit hook pre-commit/pre-commit-hooks to v4 …
renovate-bot May 18, 2021
9d7f594
skip testcase stdlib ConnectionError on Python2
cojenco May 19, 2021
eab5274
Merge branch 'master' into connection-426
cojenco May 19, 2021
42b0b6e
Merge branch 'master' into connection-426
tseaver May 20, 2021
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
10 changes: 9 additions & 1 deletion google/cloud/storage/retry.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,14 @@
import json


_RETRYABLE_TYPES = (
# ConnectionError is a built-in exception only in Python3 and not in Python2.
try:
_RETRYABLE_STDLIB_TYPES = (ConnectionError,)
except NameError:
_RETRYABLE_STDLIB_TYPES = ()


_RETRYABLE_TYPES = _RETRYABLE_STDLIB_TYPES + (
api_exceptions.TooManyRequests, # 429
api_exceptions.InternalServerError, # 500
api_exceptions.BadGateway, # 502
Expand All @@ -30,6 +37,7 @@
requests.ConnectionError,
)


# Some retriable errors don't have their own custom exception in api_core.
_ADDITIONAL_RETRYABLE_STATUS_CODES = (408,)

Expand Down
21 changes: 21 additions & 0 deletions tests/unit/test_retry.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,14 @@
import mock


try:
ConnectionError
except NameError:
_HAS_STDLIB_CONNECTION_ERROR = False
else:
_HAS_STDLIB_CONNECTION_ERROR = True


class Test_should_retry(unittest.TestCase):
def _call_fut(self, exc):
from google.cloud.storage import retry
Expand Down Expand Up @@ -56,9 +64,22 @@ def test_w_google_api_call_error_miss(self):
self.assertFalse(self._call_fut(exc))

def test_w_requests_connection_error(self):
import requests

exc = requests.ConnectionError()
self.assertTrue(self._call_fut(exc))

def test_miss_w_stdlib_error(self):
exc = ValueError("testing")
self.assertFalse(self._call_fut(exc))

@unittest.skipUnless(
_HAS_STDLIB_CONNECTION_ERROR, "No builtin 'ConnectionError' in Python 2",
)
def test_w_stdlib_connection_error(self):
exc = ConnectionError()
self.assertTrue(self._call_fut(exc))


class TestConditionalRetryPolicy(unittest.TestCase):
def _make_one(self, retry_policy, conditional_predicate, required_kwargs):
Expand Down