append details to MaxTimeMSExpired responses

Author: blink1073

pymongo/asynchronous/server.py

@@ -38,6 +38,7 @@
     _SDAMStatusMessage,
 )
 from pymongo.message import _convert_exception, _GetMore, _OpMsg, _Query
+from pymongo.pool_shared import _get_timeout_details, format_timeout_details
 from pymongo.response import PinnedResponse, Response
 
 if TYPE_CHECKING:
@@ -224,6 +225,10 @@ async def run_operation(
             if use_cmd:
                 first = docs[0]
                 await operation.client._process_response(first, operation.session)  # type: ignore[misc, arg-type]
+                # Append timeout details to MaxTimeMSExpired responses.
+                if first.get("code") == 50:
+                    timeout_details = _get_timeout_details(conn.opts)
+                    first["errmsg"] += format_timeout_details(timeout_details)
                 _check_command_response(first, conn.max_wire_version)
         except Exception as exc:
             duration = datetime.now() - start

pymongo/synchronous/server.py

@@ -37,6 +37,7 @@
     _SDAMStatusMessage,
 )
 from pymongo.message import _convert_exception, _GetMore, _OpMsg, _Query
+from pymongo.pool_shared import _get_timeout_details, format_timeout_details
 from pymongo.response import PinnedResponse, Response
 from pymongo.synchronous.helpers import _handle_reauth
 
@@ -224,6 +225,10 @@ def run_operation(
             if use_cmd:
                 first = docs[0]
                 operation.client._process_response(first, operation.session)  # type: ignore[misc, arg-type]
+                # Append timeout details to MaxTimeMSExpired responses.
+                if first.get("code") == 50:
+                    timeout_details = _get_timeout_details(conn.opts)
+                    first["errmsg"] += format_timeout_details(timeout_details)
                 _check_command_response(first, conn.max_wire_version)
         except Exception as exc:
             duration = datetime.now() - start

test/asynchronous/test_pooling.py

@@ -429,7 +429,6 @@ async def find_one():
         # maxConnecting = unbounded: 30+ connections in ~0.140+ seconds
         print(len(pool.conns))
 
-    @flaky(reason="PYTHON-5492", affects_cpython_linux=True)
     @async_client_context.require_failCommand_appName
     async def test_csot_timeout_message(self):
         client = await self.async_rs_or_single_client(appName="connectionTimeoutApp")

test/test_pooling.py

@@ -429,7 +429,6 @@ def find_one():
         # maxConnecting = unbounded: 30+ connections in ~0.140+ seconds
         print(len(pool.conns))
 
-    @flaky(reason="PYTHON-5492", affects_cpython_linux=True)
     @client_context.require_failCommand_appName
     def test_csot_timeout_message(self):
         client = self.rs_or_single_client(appName="connectionTimeoutApp")