Skip to content

Merge retry system hotfix back into the dev branch #292

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
lgarber-akamai merged 2 commits into from
Jun 9, 2023
Merged

Merge retry system hotfix back into the dev branch #292

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e6c476e
Merge pull request #290 from linode/dev
lgarber-akamai May 30, 2023
68d7c74
fix: Resolve issues with retry system implementation (#291)
lgarber-akamai Jun 1, 2023
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
17 changes: 8 additions & 9 deletions linode_api4/linode_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ def __init__(
:type retry: bool
:param retry_rate_limit_interval: The amount of time to wait between HTTP request
retries.
:type retry_rate_limit_interval: float
:type retry_rate_limit_interval: Union[float, int]
:param retry_max: The number of request retries that should be attempted before
raising an API error.
:type retry_max: int
Expand All @@ -88,28 +88,27 @@ def __init__(
if retry_statuses is not None:
retry_forcelist.extend(retry_statuses)

# make sure we got a sane backoff
if not isinstance(retry_rate_limit_interval, float):
raise ValueError("retry_rate_limit_interval must be a float")

# Ensure the max retries value is valid
if not isinstance(retry_max, int):
raise ValueError("retry_max must be an int")

self.retry = retry
self.retry_rate_limit_interval = retry_rate_limit_interval
self.retry_rate_limit_interval = float(retry_rate_limit_interval)
self.retry_max = retry_max
self.retry_statuses = retry_statuses
self.retry_statuses = retry_forcelist

# Initialize the HTTP client session
self.session = requests.Session()

self._retry_config = LinearRetry(
total=retry_max if retry else 0,
status_forcelist=retry_forcelist,
status_forcelist=self.retry_statuses,
respect_retry_after_header=True,
backoff_factor=retry_rate_limit_interval,
backoff_factor=self.retry_rate_limit_interval,
raise_on_status=False,
# By default, POST is not an allowed method.
# We should explicitly include it.
allowed_methods={"DELETE", "GET", "POST", "PUT"},
)
retry_adapter = HTTPAdapter(max_retries=self._retry_config)

Expand Down