Skip to content

Commit

Permalink
feat: Retry behavior
Browse files Browse the repository at this point in the history
* Introduce `retryable` property to auth library exceptions. This can be
  used to determine if an exception should be retried.
* Introduce `should_retry` parameter to token endpoints. If set to `False`
  the auth library will not retry failed requests. If set to `True` the
  auth library will retry failed requests. The default value is `True`
  to maintain existing behavior.
* Expanded list of HTTP Status codes that will be retried.
* Modified retry behavior to use exponential backoff.
* Increased default retry attempts from 2 to 3.
  • Loading branch information
clundin25 committed Aug 23, 2022
1 parent 28125b3 commit 3593bab
Show file tree
Hide file tree
Showing 15 changed files with 723 additions and 112 deletions.
108 changes: 108 additions & 0 deletions google/auth/_exponential_backoff.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,108 @@
# Copyright 2021 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

import time
import random

# The default amount of retry total_attempts
_DEFAULT_RETRY_TOTAL_ATTEMPTS = 3

# The default initial backoff period (1.0 second).
_DEFAULT_INITIAL_INTERVAL_MILLIS = 1000

# The default randomization factor (1.1 which results in a random period ranging
# between 10% below and 10% above the retry interval).
_DEFAULT_RANDOMIZATION_FACTOR = 0.1

# The default multiplier value (2 which is 100% increase per back off).
_DEFAULT_MULTIPLIER = 2.0

"""Exponential Backoff Utility
This is a private module that implements the exponential back off algorithm.
It can be used as a utility for code that needs to retry on failure, for example
an HTTP request.
"""


class ExponentialBackoff(object):
"""An exponential backoff iterator. This can be used in a for loop to
perform requests with exponential backoff.
Args:
total_attempts Optional[int]:
The maximum amount of retries that should happen.
The default value is 3 attempts.
initial_wait_millis Optional[int]:
The amount of time to sleep in the first backoff. This parameter
should be in milliseconds.
The default value is 1 second.
randomization_factor Optional[float]:
The amount of jitter that should be in each backoff. For example,
a value of 0.1 will introduce a jitter range of 10% to the
current backoff period.
The default value is 0.1.
multiplier Optional[float]:
The backoff multipler. This adjusts how much each backoff will
increase. For example a value of 2.0 leads to a 200% backoff
on each attempt. If the initial_wait is 1.0 it would look like
this sequence [1.0, 2.0, 4.0, 8.0].
The default value is 2.0.
"""

def __init__(
self,
*,
total_attempts=_DEFAULT_RETRY_TOTAL_ATTEMPTS,
initial_wait_millis=_DEFAULT_INITIAL_INTERVAL_MILLIS,
randomization_factor=_DEFAULT_RANDOMIZATION_FACTOR,
multiplier=_DEFAULT_MULTIPLIER,
):
self._total_attempts = total_attempts
self._initial_wait_millis = initial_wait_millis

# convert milliseconds to seconds for the time.sleep API
self._current_wait_in_seconds = self._initial_wait_millis * 0.001

self._randomization_factor = randomization_factor
self._multiplier = multiplier
self._backoff_count = 0

def __iter__(self):
self._backoff_count = 0
self._current_wait_in_seconds = self._initial_wait_millis * 0.001
return self

def __next__(self):
if self._backoff_count >= self._total_attempts:
raise StopIteration
self._backoff_count += 1

jitter_range = self._current_wait_in_seconds * self._randomization_factor
jitter = random.uniform(0, jitter_range)

time.sleep(self._current_wait_in_seconds + jitter)

self._current_wait_in_seconds *= self._multiplier
return self._backoff_count

@property
def total_attempts(self):
"""The total amount of backoff attempts that will be made."""
return self._total_attempts

@property
def backoff_count(self):
"""The current amount of backoff attempts that have been made."""
return self._backoff_count
22 changes: 17 additions & 5 deletions google/auth/exceptions.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,15 @@
class GoogleAuthError(Exception):
"""Base class for all google.auth errors."""

def __init__(self, *args, **kwargs):
super(GoogleAuthError, self).__init__(*args)
retryable = kwargs.get("retryable", False)
self._retryable = retryable

@property
def retryable(self):
return self._retryable


class TransportError(GoogleAuthError):
"""Used to indicate an error occurred during an HTTP request."""
Expand All @@ -44,6 +53,10 @@ class MutualTLSChannelError(GoogleAuthError):
class ClientCertError(GoogleAuthError):
"""Used to indicate that client certificate is missing or invalid."""

@property
def retryable(self):
return False


class OAuthError(GoogleAuthError):
"""Used to indicate an error occurred during an OAuth related HTTP
Expand All @@ -53,11 +66,10 @@ class OAuthError(GoogleAuthError):
class ReauthFailError(RefreshError):
"""An exception for when reauth failed."""

def __init__(self, message=None):
super(ReauthFailError, self).__init__(
"Reauthentication failed. {0}".format(message)
)


class ReauthSamlChallengeFailError(ReauthFailError):
"""An exception for SAML reauth challenge failures."""


class RetryError(GoogleAuthError):
"""Indicates that the auth library ran out of retries."""
11 changes: 10 additions & 1 deletion google/auth/transport/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,18 @@
import six
from six.moves import http_client

DEFAULT_RETRYABLE_STATUS_CODES = (
http_client.INTERNAL_SERVER_ERROR,
http_client.SERVICE_UNAVAILABLE,
http_client.REQUEST_TIMEOUT,
)
"""Sequence[int]: HTTP status codes indicating a request can be retried.
"""


DEFAULT_REFRESH_STATUS_CODES = (http_client.UNAUTHORIZED,)
"""Sequence[int]: Which HTTP status code indicate that credentials should be
refreshed and a request should be retried.
refreshed.
"""

DEFAULT_MAX_REFRESH_ATTEMPTS = 2
Expand Down

0 comments on commit 3593bab

Please sign in to comment.