refactor(rest): simplify sigv4 retry adapter configuration

Author: mrutunjay-kinagi

pyiceberg/catalog/rest/__init__.py

@@ -238,8 +238,6 @@ class IdentifierKind(Enum):
 SIGV4_SERVICE = "rest.signing-name"
 SIGV4_MAX_RETRIES = "rest.sigv4.max-retries"
 SIGV4_DEFAULT_MAX_RETRIES = 10
-SIGV4_RETRY_BACKOFF_FACTOR = 0.5
-SIGV4_RETRY_STATUS_CODES = (429, 500, 502, 503, 504)
 EMPTY_BODY_SHA256: str = "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
 OAUTH2_SERVER_URI = "oauth2-server-uri"
 SNAPSHOT_LOADING_MODE = "snapshot-loading-mode"
@@ -697,25 +695,11 @@ def _init_sigv4(self, session: Session) -> None:
         from botocore.awsrequest import AWSRequest
         from requests import PreparedRequest
         from requests.adapters import HTTPAdapter
-        from urllib3.util.retry import Retry
-
         class SigV4Adapter(HTTPAdapter):
             def __init__(self, **properties: str):
                 self._properties = properties
                 max_retries = property_as_int(self._properties, SIGV4_MAX_RETRIES, SIGV4_DEFAULT_MAX_RETRIES)
-                super().__init__(
-                    max_retries=Retry(
-                        total=max_retries,
-                        status=max_retries,
-                        connect=max_retries,
-                        read=max_retries,
-                        # Keep retries conservative for idempotent calls.
-                        allowed_methods=frozenset({"GET", "HEAD", "OPTIONS"}),
-                        status_forcelist=SIGV4_RETRY_STATUS_CODES,
-                        backoff_factor=SIGV4_RETRY_BACKOFF_FACTOR,
-                        respect_retry_after_header=True,
-                    )
-                )
+                super().__init__(max_retries=max_retries)
                 self._boto_session = boto3.Session(
                     profile_name=get_first_property_value(self._properties, AWS_PROFILE_NAME),
                     region_name=get_first_property_value(self._properties, AWS_REGION),

tests/catalog/test_rest.py

@@ -547,7 +547,6 @@ def test_sigv4_adapter_default_retry_config(rest_mock: Mocker) -> None:
     adapter = catalog._session.adapters[catalog.uri]
     assert isinstance(adapter, HTTPAdapter)
     assert adapter.max_retries.total == SIGV4_DEFAULT_MAX_RETRIES
-    assert 429 in adapter.max_retries.status_forcelist
 
 
 def test_sigv4_adapter_override_retry_config(rest_mock: Mocker) -> None: