Merge branch 'master' into PYTHON-5168

Author: ShaneHarvey

.github/workflows/release-python.yml

@@ -20,7 +20,6 @@ env:
   # Changes per repo
   PRODUCT_NAME: PyMongo
   # Changes per branch
-  SILK_ASSET_GROUP: mongodb-python-driver
   EVERGREEN_PROJECT: mongo-python-driver
   # Constant
   # inputs will be empty on a scheduled run.  so, we only set dry_run
@@ -122,7 +121,6 @@ jobs:
           version: ${{ env.VERSION }}
           following_version: ${{ env.FOLLOWING_VERSION }}
           product_name: ${{ env.PRODUCT_NAME }}
-          silk_asset_group: ${{ env.SILK_ASSET_GROUP }}
           evergreen_project: ${{ env.EVERGREEN_PROJECT }}
           token: ${{ github.token }}
           dry_run: ${{ env.DRY_RUN }}

pymongo/topology_description.py

@@ -33,7 +33,7 @@
 from bson.min_key import MinKey
 from bson.objectid import ObjectId
 from pymongo import common
-from pymongo.errors import ConfigurationError
+from pymongo.errors import ConfigurationError, PyMongoError
 from pymongo.read_preferences import ReadPreference, _AggWritePref, _ServerMode
 from pymongo.server_description import ServerDescription
 from pymongo.server_selectors import Selection
@@ -563,7 +563,11 @@ def _update_rs_from_primary(
         if None not in new_election_tuple:
             if None not in max_election_tuple and new_election_tuple < max_election_tuple:
                 # Stale primary, set to type Unknown.
-                sds[server_description.address] = server_description.to_unknown()
+                sds[server_description.address] = server_description.to_unknown(
+                    PyMongoError(
+                        f"primary marked stale due to electionId/setVersion mismatch, {new_election_tuple} is stale compared to {max_election_tuple}"
+                    )
+                )
                 return _check_has_primary(sds), replica_set_name, max_set_version, max_election_id
             max_election_id = server_description.election_id
 
@@ -578,7 +582,11 @@ def _update_rs_from_primary(
         max_election_safe = tuple(MinKey() if i is None else i for i in max_election_tuple)
         if new_election_safe < max_election_safe:
             # Stale primary, set to type Unknown.
-            sds[server_description.address] = server_description.to_unknown()
+            sds[server_description.address] = server_description.to_unknown(
+                PyMongoError(
+                    f"primary marked stale due to electionId/setVersion mismatch, {new_election_tuple} is stale compared to {max_election_tuple}"
+                )
+            )
             return _check_has_primary(sds), replica_set_name, max_set_version, max_election_id
         else:
             max_election_id = server_description.election_id
@@ -591,7 +599,9 @@ def _update_rs_from_primary(
             and server.address != server_description.address
         ):
             # Reset old primary's type to Unknown.
-            sds[server.address] = server.to_unknown()
+            sds[server.address] = server.to_unknown(
+                PyMongoError("primary marked stale due to discovery of newer primary")
+            )
 
             # There can be only one prior primary.
             break

test/asynchronous/test_client.py

@@ -1847,20 +1847,20 @@ def server_description_count():
             return i
 
         gc.collect()
-        with client_knobs(min_heartbeat_interval=0.003):
+        with client_knobs(min_heartbeat_interval=0.002):
             client = self.simple_client(
-                "invalid:27017", heartbeatFrequencyMS=3, serverSelectionTimeoutMS=150
+                "invalid:27017", heartbeatFrequencyMS=2, serverSelectionTimeoutMS=200
             )
             initial_count = server_description_count()
             with self.assertRaises(ServerSelectionTimeoutError):
                 await client.test.test.find_one()
             gc.collect()
             final_count = server_description_count()
+            await client.close()
             # If a bug like PYTHON-2433 is reintroduced then too many
             # ServerDescriptions will be kept alive and this test will fail:
-            # AssertionError: 19 != 46 within 15 delta (27 difference)
-            # On Python 3.11 we seem to get more of a delta.
-            self.assertAlmostEqual(initial_count, final_count, delta=20)
+            # AssertionError: 11 != 47 within 20 delta (36 difference)
+            self.assertAlmostEqual(initial_count, final_count, delta=30)
 
     @async_client_context.require_failCommand_fail_point
     async def test_network_error_message(self):

test/asynchronous/test_discovery_and_monitoring.py

@@ -180,6 +180,9 @@ def check_outcome(self, topology, outcome):
             server_type_name(expected_server_type),
             server_type_name(actual_server_description.server_type),
         )
+        expected_error = expected_server.get("error")
+        if expected_error:
+            self.assertIn(expected_error, str(actual_server_description.error))
 
         self.assertEqual(expected_server.get("setName"), actual_server_description.replica_set_name)
 

test/asynchronous/unified_format.py

@@ -384,6 +384,7 @@ async def drop(self: AsyncGridFSBucket, *args: Any, **kwargs: Any) -> None:
             name = spec["id"]
             thread = SpecRunnerTask(name)
             await thread.start()
+            self.test.addAsyncCleanup(thread.join, 5)
             self[name] = thread
             return
 

test/discovery_and_monitoring/rs/new_primary.json

@@ -58,7 +58,8 @@
         "servers": {
           "a:27017": {
             "type": "Unknown",
-            "setName": null
+            "setName": null,
+            "error": "primary marked stale due to discovery of newer primary"
           },
           "b:27017": {
             "type": "RSPrimary",

test/discovery_and_monitoring/rs/new_primary_new_electionid.json

@@ -76,7 +76,8 @@
           "a:27017": {
             "type": "Unknown",
             "setName": null,
-            "electionId": null
+            "electionId": null,
+            "error": "primary marked stale due to discovery of newer primary"
           },
           "b:27017": {
             "type": "RSPrimary",
@@ -123,7 +124,8 @@
           "a:27017": {
             "type": "Unknown",
             "setName": null,
-            "electionId": null
+            "electionId": null,
+            "error": "primary marked stale due to electionId/setVersion mismatch"
           },
           "b:27017": {
             "type": "RSPrimary",

test/discovery_and_monitoring/rs/new_primary_new_setversion.json

@@ -76,7 +76,8 @@
           "a:27017": {
             "type": "Unknown",
             "setName": null,
-            "electionId": null
+            "electionId": null,
+            "error": "primary marked stale due to discovery of newer primary"
           },
           "b:27017": {
             "type": "RSPrimary",
@@ -123,7 +124,8 @@
           "a:27017": {
             "type": "Unknown",
             "setName": null,
-            "electionId": null
+            "electionId": null,
+            "error": "primary marked stale due to electionId/setVersion mismatch"
           },
           "b:27017": {
             "type": "RSPrimary",

test/discovery_and_monitoring/rs/primary_disconnect_electionid.json

@@ -48,7 +48,8 @@
           "a:27017": {
             "type": "Unknown",
             "setName": null,
-            "electionId": null
+            "electionId": null,
+            "error": "primary marked stale due to discovery of newer primary"
           },
           "b:27017": {
             "type": "RSPrimary",
@@ -124,6 +125,7 @@
           "a:27017": {
             "type": "Unknown",
             "setName": null,
+            "error": "primary marked stale due to electionId/setVersion mismatch",
             "electionId": null
           },
           "b:27017": {

test/discovery_and_monitoring/rs/primary_disconnect_setversion.json

@@ -48,7 +48,8 @@
           "a:27017": {
             "type": "Unknown",
             "setName": null,
-            "electionId": null
+            "electionId": null,
+            "error": "primary marked stale due to discovery of newer primary"
           },
           "b:27017": {
             "type": "RSPrimary",
@@ -124,6 +125,7 @@
           "a:27017": {
             "type": "Unknown",
             "setName": null,
+            "error": "primary marked stale due to electionId/setVersion mismatch",
             "electionId": null
           },
           "b:27017": {