Merge branch 'master' of github.com:mongodb/mongo-python-driver into PYTHON-5157

Author: blink1073

.evergreen/scripts/bootstrap-mongo-orchestration.sh

@@ -2,38 +2,21 @@
 
 set -eu
 
-
-# Enable core dumps if enabled on the machine
-# Copied from https://github.com/mongodb/mongo/blob/master/etc/evergreen.yml
-if [ -f /proc/self/coredump_filter ]; then
-    # Set the shell process (and its children processes) to dump ELF headers (bit 4),
-    # anonymous shared mappings (bit 1), and anonymous private mappings (bit 0).
-    echo 0x13 >/proc/self/coredump_filter
-
-    if [ -f /sbin/sysctl ]; then
-        # Check that the core pattern is set explicitly on our distro image instead
-        # of being the OS's default value. This ensures that coredump names are consistent
-        # across distros and can be picked up by Evergreen.
-        core_pattern=$(/sbin/sysctl -n "kernel.core_pattern")
-        if [ "$core_pattern" = "dump_%e.%p.core" ]; then
-            echo "Enabling coredumps"
-            ulimit -c unlimited
-        fi
-    fi
-fi
-
-if [ "$(uname -s)" = "Darwin" ]; then
-    core_pattern_mac=$(/usr/sbin/sysctl -n "kern.corefile")
-    if [ "$core_pattern_mac" = "dump_%N.%P.core" ]; then
-        echo "Enabling coredumps"
-        ulimit -c unlimited
-    fi
-fi
+HERE=$(dirname ${BASH_SOURCE:-$0})
+HERE="$( cd -- "$HERE" > /dev/null 2>&1 && pwd )"
+ROOT=$(dirname "$(dirname $HERE)")
 
 if [ -z "${TEST_CRYPT_SHARED:-}" ]; then
     export SKIP_CRYPT_SHARED=1
 fi
 
+# Override the tls files if applicable.
+if [ "${SSL:-}" == "ssl" ]; then
+    export TLS_CERT_KEY_FILE=${ROOT}/test/certificates/client.pem
+    export TLS_PEM_KEY_FILE=${ROOT}/test/certificates/server.pem
+    export TLS_CA_FILE=${ROOT}/test/certificates/ca.pem
+fi
+
 MONGODB_VERSION=${VERSION:-} \
     TOPOLOGY=${TOPOLOGY:-} \
     AUTH=${AUTH:-} \

.evergreen/scripts/configure-env.sh

@@ -76,7 +76,11 @@ EOT
 
 # Write the .env file for drivers-tools.
 rm -rf $DRIVERS_TOOLS
-git clone --branch aws-output-file https://github.com/blink1073/drivers-evergreen-tools.git $DRIVERS_TOOLS
+BRANCH=master
+ORG=mongodb-labs
+BRANCH=aws-output-file
+ORG=blink1073
+git clone --branch $BRANCH https://github.com/$ORG/drivers-evergreen-tools.git $DRIVERS_TOOLS
 
 cat <<EOT > ${DRIVERS_TOOLS}/.env
 SKIP_LEGACY_SHELL=1

.evergreen/scripts/prepare-resources.sh

@@ -7,8 +7,35 @@ pushd "$(dirname "$(dirname $HERE)")"
 echo "Setting up system..."
 bash .evergreen/scripts/configure-env.sh
 source .evergreen/scripts/env.sh
-bash .evergreen/scripts/prepare-resources.sh
 bash $DRIVERS_TOOLS/.evergreen/setup.sh
 bash .evergreen/scripts/install-dependencies.sh
 popd
+
+# Enable core dumps if enabled on the machine
+# Copied from https://github.com/mongodb/mongo/blob/master/etc/evergreen.yml
+if [ -f /proc/self/coredump_filter ]; then
+    # Set the shell process (and its children processes) to dump ELF headers (bit 4),
+    # anonymous shared mappings (bit 1), and anonymous private mappings (bit 0).
+    echo 0x13 >/proc/self/coredump_filter
+
+    if [ -f /sbin/sysctl ]; then
+        # Check that the core pattern is set explicitly on our distro image instead
+        # of being the OS's default value. This ensures that coredump names are consistent
+        # across distros and can be picked up by Evergreen.
+        core_pattern=$(/sbin/sysctl -n "kernel.core_pattern")
+        if [ "$core_pattern" = "dump_%e.%p.core" ]; then
+            echo "Enabling coredumps"
+            ulimit -c unlimited
+        fi
+    fi
+fi
+
+if [ "$(uname -s)" = "Darwin" ]; then
+    core_pattern_mac=$(/usr/sbin/sysctl -n "kern.corefile")
+    if [ "$core_pattern_mac" = "dump_%N.%P.core" ]; then
+        echo "Enabling coredumps"
+        ulimit -c unlimited
+    fi
+fi
+
 echo "Setting up system... done."

.evergreen/scripts/setup-system.sh

@@ -1,7 +1,26 @@
 Changelog
 =========
 
-Changes in Version 4.11.0 (YYYY/MM/DD)
+Changes in Version 4.11.2 (YYYY/MM/DD)
+--------------------------------------
+
+Version 4.11.2 is a bug fix release.
+
+- Fixed a bug where :meth:`~pymongo.database.Database.command` would fail when attempting to run the bulkWrite command.
+
+Issues Resolved
+...............
+
+See the `PyMongo 4.11.2 release notes in JIRA`_ for the list of resolved issues in this release.
+
+.. _PyMongo 4.11.2 release notes in JIRA: https://jira.mongodb.org/secure/ReleaseNote.jspa?projectId=10004&version=42506
+
+Changes in Version 4.11.1 (2025/02/10)
+--------------------------------------
+
+- Fixed support for prebuilt ``ppc64le`` and ``s390x`` wheels.
+
+Changes in Version 4.11.0 (2025/01/28)
 --------------------------------------
 
 .. warning:: PyMongo 4.11 drops support for Python 3.8 and PyPy 3.9: Python 3.9+ or PyPy 3.10+ is now required.

doc/changelog.rst

@@ -1301,11 +1301,8 @@ async def write(self, data: Any) -> None:
             raise ValueError("cannot write to a closed file")
 
         try:
-            if isinstance(data, AsyncGridOut):
-                read = data.read
-            else:
-                # file-like
-                read = data.read
+            # file-like
+            read = data.read
         except AttributeError:
             # string
             if not isinstance(data, (str, bytes)):
@@ -1317,7 +1314,7 @@ async def write(self, data: Any) -> None:
                     raise TypeError(
                         "must specify an encoding for file in order to write str"
                     ) from None
-            read = io.BytesIO(data).read  # type: ignore[assignment]
+            read = io.BytesIO(data).read
 
         if inspect.iscoroutinefunction(read):
             await self._write_async(read)
@@ -1331,15 +1328,15 @@ async def write(self, data: Any) -> None:
                     except BaseException:
                         await self.abort()
                         raise
-                    self._buffer.write(to_write)  # type: ignore
-                    if len(to_write) < space:  # type: ignore
+                    self._buffer.write(to_write)
+                    if len(to_write) < space:
                         return  # EOF or incomplete
                 await self._flush_buffer()
             to_write = read(self.chunk_size)
-            while to_write and len(to_write) == self.chunk_size:  # type: ignore
+            while to_write and len(to_write) == self.chunk_size:
                 await self._flush_data(to_write)
                 to_write = read(self.chunk_size)
-            self._buffer.write(to_write)  # type: ignore
+            self._buffer.write(to_write)
 
     async def _write_async(self, read: Any) -> None:
         if self._buffer.tell() > 0:

gridfs/asynchronous/grid_file.py

@@ -1291,11 +1291,8 @@ def write(self, data: Any) -> None:
             raise ValueError("cannot write to a closed file")
 
         try:
-            if isinstance(data, GridOut):
-                read = data.read
-            else:
-                # file-like
-                read = data.read
+            # file-like
+            read = data.read
         except AttributeError:
             # string
             if not isinstance(data, (str, bytes)):
@@ -1307,7 +1304,7 @@ def write(self, data: Any) -> None:
                     raise TypeError(
                         "must specify an encoding for file in order to write str"
                     ) from None
-            read = io.BytesIO(data).read  # type: ignore[assignment]
+            read = io.BytesIO(data).read
 
         if inspect.iscoroutinefunction(read):
             self._write_async(read)
@@ -1321,15 +1318,15 @@ def write(self, data: Any) -> None:
                     except BaseException:
                         self.abort()
                         raise
-                    self._buffer.write(to_write)  # type: ignore
-                    if len(to_write) < space:  # type: ignore
+                    self._buffer.write(to_write)
+                    if len(to_write) < space:
                         return  # EOF or incomplete
                 self._flush_buffer()
             to_write = read(self.chunk_size)
-            while to_write and len(to_write) == self.chunk_size:  # type: ignore
+            while to_write and len(to_write) == self.chunk_size:
                 self._flush_data(to_write)
                 to_write = read(self.chunk_size)
-            self._buffer.write(to_write)  # type: ignore
+            self._buffer.write(to_write)
 
     def _write_async(self, read: Any) -> None:
         if self._buffer.tell() > 0:

gridfs/synchronous/grid_file.py

@@ -21,11 +21,11 @@
 import logging
 import time
 import weakref
-from typing import TYPE_CHECKING, Any, Mapping, Optional, cast
+from typing import TYPE_CHECKING, Any, Optional
 
 from pymongo import common, periodic_executor
 from pymongo._csot import MovingMinimum
-from pymongo.errors import NetworkTimeout, NotPrimaryError, OperationFailure, _OperationCancelled
+from pymongo.errors import NetworkTimeout, _OperationCancelled
 from pymongo.hello import Hello
 from pymongo.lock import _async_create_lock
 from pymongo.logger import _SDAM_LOGGER, _debug_log, _SDAMStatusMessage
@@ -255,13 +255,7 @@ async def _check_server(self) -> ServerDescription:
         self._conn_id = None
         start = time.monotonic()
         try:
-            try:
-                return await self._check_once()
-            except (OperationFailure, NotPrimaryError) as exc:
-                # Update max cluster time even when hello fails.
-                details = cast(Mapping[str, Any], exc.details)
-                await self._topology.receive_cluster_time(details.get("$clusterTime"))
-                raise
+            return await self._check_once()
         except ReferenceError:
             raise
         except Exception as error:
@@ -358,7 +352,6 @@ async def _check_with_socket(self, conn: AsyncConnection) -> tuple[Hello, float]
 
         Can raise ConnectionFailure or OperationFailure.
         """
-        cluster_time = self._topology.max_cluster_time()
         start = time.monotonic()
         if conn.more_to_come:
             # Read the next streaming hello (MongoDB 4.4+).
@@ -368,13 +361,12 @@ async def _check_with_socket(self, conn: AsyncConnection) -> tuple[Hello, float]
         ):
             # Initiate streaming hello (MongoDB 4.4+).
             response = await conn._hello(
-                cluster_time,
                 self._server_description.topology_version,
                 self._settings.heartbeat_frequency,
             )
         else:
             # New connection handshake or polling hello (MongoDB <4.4).
-            response = await conn._hello(cluster_time, None, None)
+            response = await conn._hello(None, None)
         duration = _monotonic_duration(start)
         return response, duration
 

pymongo/asynchronous/monitor.py

@@ -207,6 +207,10 @@ async def command(
             )
 
             response_doc = unpacked_docs[0]
+            if not conn.ready:
+                cluster_time = response_doc.get("$clusterTime")
+                if cluster_time:
+                    conn._cluster_time = cluster_time
             if client:
                 await client._process_response(response_doc, session)
             if check:

pymongo/asynchronous/network.py

@@ -102,7 +102,7 @@
     from pymongo.pyopenssl_context import _sslConn
     from pymongo.read_concern import ReadConcern
     from pymongo.read_preferences import _ServerMode
-    from pymongo.typings import ClusterTime, _Address, _CollationIn
+    from pymongo.typings import _Address, _CollationIn
     from pymongo.write_concern import WriteConcern
 
 try:
@@ -310,6 +310,8 @@ def __init__(
         self.connect_rtt = 0.0
         self._client_id = pool._client_id
         self.creation_time = time.monotonic()
+        # For gossiping $clusterTime from the connection handshake to the client.
+        self._cluster_time = None
 
     def set_conn_timeout(self, timeout: Optional[float]) -> None:
         """Cache last timeout to avoid duplicate calls to conn.settimeout."""
@@ -374,11 +376,10 @@ def hello_cmd(self) -> dict[str, Any]:
             return {HelloCompat.LEGACY_CMD: 1, "helloOk": True}
 
     async def hello(self) -> Hello:
-        return await self._hello(None, None, None)
+        return await self._hello(None, None)
 
     async def _hello(
         self,
-        cluster_time: Optional[ClusterTime],
         topology_version: Optional[Any],
         heartbeat_frequency: Optional[int],
     ) -> Hello[dict[str, Any]]:
@@ -401,9 +402,6 @@ async def _hello(
             if self.opts.connect_timeout:
                 self.set_conn_timeout(self.opts.connect_timeout + heartbeat_frequency)
 
-        if not performing_handshake and cluster_time is not None:
-            cmd["$clusterTime"] = cluster_time
-
         creds = self.opts._credentials
         if creds:
             if creds.mechanism == "DEFAULT" and creds.username:
@@ -1316,6 +1314,9 @@ async def connect(self, handler: Optional[_MongoClientErrorHandler] = None) -> A
             conn.close_conn(ConnectionClosedReason.ERROR)
             raise
 
+        if handler:
+            await handler.client._topology.receive_cluster_time(conn._cluster_time)
+
         return conn
 
     @contextlib.asynccontextmanager