removed all retryable tracking logic

Author: Jibola

pymongo/asynchronous/helpers.py

@@ -22,15 +22,14 @@
 import socket
 import sys
 import time as time  # noqa: PLC0414 # needed in sync version
-from contextvars import ContextVar
 from typing import (
     Any,
     Callable,
     TypeVar,
     cast,
 )
 
-from pymongo import _csot
+from pymongo import _csot, common
 from pymongo.errors import (
     OperationFailure,
 )
@@ -77,13 +76,9 @@ async def inner(*args: Any, **kwargs: Any) -> Any:
     return cast(F, inner)
 
 
-_MAX_RETRIES = 2
 _BACKOFF_INITIAL = 0.1
 _BACKOFF_MAX = 10
 
-# Context variable used to pass the current retry attempt number to conn.command()
-# so that retry metadata can be injected into outgoing command bodies.
-_RETRY_ATTEMPT: ContextVar[int] = ContextVar("_retry_attempt", default=0)
 DEFAULT_RETRY_TOKEN_CAPACITY = 1000.0
 DEFAULT_RETRY_TOKEN_RETURN = 0.1
 
@@ -133,7 +128,7 @@ class _RetryPolicy:
     def __init__(
         self,
         token_bucket: _TokenBucket,
-        attempts: int = _MAX_RETRIES,
+        attempts: int = common._MAX_RETRIES,
         backoff_initial: float = _BACKOFF_INITIAL,
         backoff_max: float = _BACKOFF_MAX,
         adaptive_retry: bool = False,

pymongo/asynchronous/mongo_client.py

@@ -69,7 +69,6 @@
 from pymongo.asynchronous.client_session import _SESSION, _EmptyServerSession
 from pymongo.asynchronous.command_cursor import AsyncCommandCursor
 from pymongo.asynchronous.helpers import (
-    _RETRY_ATTEMPT,
     _RetryPolicy,
     _TokenBucket,
 )
@@ -897,7 +896,7 @@ def __init__(
 
         self._retry_policy = _RetryPolicy(
             _TokenBucket(),
-            attempts=self._options.max_adaptive_retries,
+            attempts=self._options.max_retries,
             adaptive_retry=self._options.adaptive_retries,
         )
 
@@ -2823,7 +2822,6 @@ async def run(self) -> T:
 
         while True:
             self._check_last_error(check_csot=True)
-            retry_token = _RETRY_ATTEMPT.set(self._attempt_number)
             try:
                 res = await self._read() if self._is_read else await self._write()
                 await self._retry_policy.record_success(self._attempt_number > 0)
@@ -2950,8 +2948,6 @@ async def run(self) -> T:
                         else:
                             raise
                     await asyncio.sleep(delay)
-            finally:
-                _RETRY_ATTEMPT.reset(retry_token)
 
     def _is_not_eligible_for_retry(self) -> bool:
         """Checks if the exchange is not eligible for retry"""

pymongo/asynchronous/pool.py

@@ -39,7 +39,7 @@
 from bson import DEFAULT_CODEC_OPTIONS
 from pymongo import _csot, helpers_shared
 from pymongo.asynchronous.client_session import _validate_session_write_concern
-from pymongo.asynchronous.helpers import _RETRY_ATTEMPT, _handle_reauth
+from pymongo.asynchronous.helpers import _handle_reauth
 from pymongo.asynchronous.network import command
 from pymongo.common import (
     MAX_BSON_SIZE,
@@ -395,9 +395,6 @@ async def command(
         if session:
             session._apply_to(spec, retryable_write, read_preference, self)
         self.send_cluster_time(spec, session, client)
-        retry_attempt = _RETRY_ATTEMPT.get()
-        if retry_attempt > 0:
-            spec["retry"] = retry_attempt
         listeners = self.listeners if publish_events else None
         unacknowledged = bool(write_concern and not write_concern.acknowledged)
         if self.op_msg_enabled:

pymongo/client_options.py

@@ -240,10 +240,10 @@ def __init__(
             if "adaptive_retries" in options
             else options.get("adaptiveretries", common.ADAPTIVE_RETRIES)
         )
-        self.__max_adaptive_retries = (
-            options.get("max_adaptive_retries", common.MAX_ADAPTIVE_RETRIES)
-            if "max_adaptive_retries" in options
-            else options.get("maxadaptiveretries", common.MAX_ADAPTIVE_RETRIES)
+        self.__max_retries = (
+            options.get("max_retries", common._MAX_RETRIES)
+            if "max_retries" in options
+            else options.get("maxretries", common._MAX_RETRIES)
         )
         self.__enable_overload_retargeting = (
             options.get("enable_overload_retargeting", common.ENABLE_OVERLOAD_RETARGETING)
@@ -371,12 +371,12 @@ def adaptive_retries(self) -> bool:
         return self.__adaptive_retries
 
     @property
-    def max_adaptive_retries(self) -> int:
-        """The configured maxAdaptiveRetries option.
+    def max_retries(self) -> int:
+        """The configured maxRetries option.
 
         .. versionadded:: 4.XX
         """
-        return self.__max_adaptive_retries
+        return self.__max_retries
 
     @property
     def enable_overload_retargeting(self) -> bool:

pymongo/common.py

@@ -143,8 +143,8 @@
 # Default value for adaptiveRetries
 ADAPTIVE_RETRIES = False
 
-# Default value for maxAdaptiveRetries
-MAX_ADAPTIVE_RETRIES = 2
+# Default value for max retries
+_MAX_RETRIES = 2
 
 # Default value for enableOverloadRetargeting
 ENABLE_OVERLOAD_RETARGETING = False
@@ -782,7 +782,7 @@ def validate_server_monitoring_mode(option: str, value: str) -> str:
     "auto_encryption_opts": validate_auto_encryption_opts_or_none,
     "authoidcallowedhosts": validate_list,
     "adaptive_retries": validate_boolean_or_string,
-    "max_adaptive_retries": validate_non_negative_integer,
+    "max_retries": validate_non_negative_integer,
     "enable_overload_retargeting": validate_boolean_or_string,
 }
 

pymongo/synchronous/helpers.py

@@ -22,15 +22,14 @@
 import socket
 import sys
 import time as time  # noqa: PLC0414 # needed in sync version
-from contextvars import ContextVar
 from typing import (
     Any,
     Callable,
     TypeVar,
     cast,
 )
 
-from pymongo import _csot
+from pymongo import _csot, common
 from pymongo.errors import (
     OperationFailure,
 )
@@ -77,13 +76,9 @@ def inner(*args: Any, **kwargs: Any) -> Any:
     return cast(F, inner)
 
 
-_MAX_RETRIES = 2
 _BACKOFF_INITIAL = 0.1
 _BACKOFF_MAX = 10
 
-# Context variable used to pass the current retry attempt number to conn.command()
-# so that retry metadata can be injected into outgoing command bodies.
-_RETRY_ATTEMPT: ContextVar[int] = ContextVar("_retry_attempt", default=0)
 DEFAULT_RETRY_TOKEN_CAPACITY = 1000.0
 DEFAULT_RETRY_TOKEN_RETURN = 0.1
 
@@ -133,7 +128,7 @@ class _RetryPolicy:
     def __init__(
         self,
         token_bucket: _TokenBucket,
-        attempts: int = _MAX_RETRIES,
+        attempts: int = common._MAX_RETRIES,
         backoff_initial: float = _BACKOFF_INITIAL,
         backoff_max: float = _BACKOFF_MAX,
         adaptive_retry: bool = False,

pymongo/synchronous/mongo_client.py

@@ -112,7 +112,6 @@
 from pymongo.synchronous.client_session import _SESSION, _EmptyServerSession
 from pymongo.synchronous.command_cursor import CommandCursor
 from pymongo.synchronous.helpers import (
-    _RETRY_ATTEMPT,
     _RetryPolicy,
     _TokenBucket,
 )
@@ -897,7 +896,7 @@ def __init__(
 
         self._retry_policy = _RetryPolicy(
             _TokenBucket(),
-            attempts=self._options.max_adaptive_retries,
+            attempts=self._options.max_retries,
             adaptive_retry=self._options.adaptive_retries,
         )
 
@@ -2813,7 +2812,6 @@ def run(self) -> T:
 
         while True:
             self._check_last_error(check_csot=True)
-            retry_token = _RETRY_ATTEMPT.set(self._attempt_number)
             try:
                 res = self._read() if self._is_read else self._write()
                 self._retry_policy.record_success(self._attempt_number > 0)
@@ -2940,8 +2938,6 @@ def run(self) -> T:
                         else:
                             raise
                     time.sleep(delay)
-            finally:
-                _RETRY_ATTEMPT.reset(retry_token)
 
     def _is_not_eligible_for_retry(self) -> bool:
         """Checks if the exchange is not eligible for retry"""

pymongo/synchronous/pool.py

@@ -88,7 +88,7 @@
 from pymongo.server_type import SERVER_TYPE
 from pymongo.socket_checker import SocketChecker
 from pymongo.synchronous.client_session import _validate_session_write_concern
-from pymongo.synchronous.helpers import _RETRY_ATTEMPT, _handle_reauth
+from pymongo.synchronous.helpers import _handle_reauth
 from pymongo.synchronous.network import command
 
 if TYPE_CHECKING:
@@ -395,9 +395,6 @@ def command(
         if session:
             session._apply_to(spec, retryable_write, read_preference, self)
         self.send_cluster_time(spec, session, client)
-        retry_attempt = _RETRY_ATTEMPT.get()
-        if retry_attempt > 0:
-            spec["retry"] = retry_attempt
         listeners = self.listeners if publish_events else None
         unacknowledged = bool(write_concern and not write_concern.acknowledged)
         if self.op_msg_enabled: