Skip to content

Add version check for urllib3 in backoff calculation #526

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
shivam2680 merged 2 commits into from
Mar 11, 2025
+7 −2
Merged

Add version check for urllib3 in backoff calculation #526

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
de9e731
Add version check for urllib3 in backoff calculation
shivam2680 Mar 5, 2025
fbfa743
Merge remote-tracking branch 'origin/main' into backoff-jitter-fix
shivam2680 Mar 10, 2025
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
9 changes: 7 additions & 2 deletions src/databricks/sql/auth/retry.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
from enum import Enum
from typing import List, Optional, Tuple, Union

import urllib3

# We only use this import for type hinting
try:
# If urllib3~=2.0 is installed
Expand All @@ -14,6 +16,8 @@
from urllib3 import HTTPResponse as BaseHTTPResponse
from urllib3 import Retry
from urllib3.util.retry import RequestHistory
from packaging import version


from databricks.sql.exc import (
CursorAlreadyClosedError,
Expand Down Expand Up @@ -308,8 +312,9 @@ def get_backoff_time(self) -> float:

current_attempt = self.stop_after_attempts_count - int(self.total or 0)
proposed_backoff = (2**current_attempt) * self.delay_min
if self.backoff_jitter != 0.0:
proposed_backoff += random.random() * self.backoff_jitter
if version.parse(urllib3.__version__) >= version.parse("2.0.0"):
if self.backoff_jitter != 0.0:
proposed_backoff += random.random() * self.backoff_jitter

proposed_backoff = min(proposed_backoff, self.delay_max)
self.check_proposed_wait(proposed_backoff)
Expand Down
Loading