Address review

Author: NoahStapp

pymongo/asynchronous/mongo_client.py

@@ -768,6 +768,7 @@ def __init__(
         self._timeout: float | None = None
         self._topology_settings: TopologySettings = None  # type: ignore[assignment]
         self._event_listeners: _EventListeners | None = None
+        self._initial_topology_id: Optional[ObjectId] = None  # type: ignore[assignment]
 
         # _pool_class, _monitor_class, and _condition_class are for deep
         # customization of PyMongo, e.g. Motor.
@@ -976,6 +977,7 @@ def _init_based_on_options(
             srv_service_name=srv_service_name,
             srv_max_hosts=srv_max_hosts,
             server_monitoring_mode=self._options.server_monitoring_mode,
+            topology_id=self._initial_topology_id,
         )
         if self._options.auto_encryption_opts:
             from pymongo.asynchronous.encryption import _Encrypter
@@ -1210,14 +1212,15 @@ def topology_description(self) -> TopologyDescription:
             servers = {
                 (host, self._port): ServerDescription((host, self._port)) for host in self._seeds
             }
-            return TopologyDescription(
+            td = TopologyDescription(
                 TOPOLOGY_TYPE.Unknown,
                 servers,
                 None,
                 None,
                 None,
                 TopologySettings(),
             )
+            self._initial_topology_id = td._topology_settings._topology_id
         return self._topology.description
 
     @property

pymongo/asynchronous/settings.py

@@ -51,6 +51,7 @@ def __init__(
         srv_service_name: str = common.SRV_SERVICE_NAME,
         srv_max_hosts: int = 0,
         server_monitoring_mode: str = common.SERVER_MONITORING_MODE,
+        topology_id: Optional[ObjectId] = None,
     ):
         """Represent MongoClient's configuration.
 
@@ -78,8 +79,10 @@ def __init__(
         self._srv_service_name = srv_service_name
         self._srv_max_hosts = srv_max_hosts or 0
         self._server_monitoring_mode = server_monitoring_mode
-
-        self._topology_id = ObjectId()
+        if topology_id is not None:
+            self._topology_id = topology_id
+        else:
+            self._topology_id = ObjectId()
         # Store the allocation traceback to catch unclosed clients in the
         # test suite.
         self._stack = "".join(traceback.format_stack()[:-2])

pymongo/synchronous/mongo_client.py

@@ -766,6 +766,7 @@ def __init__(
         self._timeout: float | None = None
         self._topology_settings: TopologySettings = None  # type: ignore[assignment]
         self._event_listeners: _EventListeners | None = None
+        self._initial_topology_id: Optional[ObjectId] = None  # type: ignore[assignment]
 
         # _pool_class, _monitor_class, and _condition_class are for deep
         # customization of PyMongo, e.g. Motor.
@@ -974,6 +975,7 @@ def _init_based_on_options(
             srv_service_name=srv_service_name,
             srv_max_hosts=srv_max_hosts,
             server_monitoring_mode=self._options.server_monitoring_mode,
+            topology_id=self._initial_topology_id,
         )
         if self._options.auto_encryption_opts:
             from pymongo.synchronous.encryption import _Encrypter
@@ -1208,14 +1210,15 @@ def topology_description(self) -> TopologyDescription:
             servers = {
                 (host, self._port): ServerDescription((host, self._port)) for host in self._seeds
             }
-            return TopologyDescription(
+            td = TopologyDescription(
                 TOPOLOGY_TYPE.Unknown,
                 servers,
                 None,
                 None,
                 None,
                 TopologySettings(),
             )
+            self._initial_topology_id = td._topology_settings._topology_id
         return self._topology.description
 
     @property

pymongo/synchronous/settings.py

@@ -51,6 +51,7 @@ def __init__(
         srv_service_name: str = common.SRV_SERVICE_NAME,
         srv_max_hosts: int = 0,
         server_monitoring_mode: str = common.SERVER_MONITORING_MODE,
+        topology_id: Optional[ObjectId] = None,
     ):
         """Represent MongoClient's configuration.
 
@@ -78,8 +79,10 @@ def __init__(
         self._srv_service_name = srv_service_name
         self._srv_max_hosts = srv_max_hosts or 0
         self._server_monitoring_mode = server_monitoring_mode
-
-        self._topology_id = ObjectId()
+        if topology_id is not None:
+            self._topology_id = topology_id
+        else:
+            self._topology_id = ObjectId()
         # Store the allocation traceback to catch unclosed clients in the
         # test suite.
         self._stack = "".join(traceback.format_stack()[:-2])

test/asynchronous/test_client.py

@@ -825,20 +825,29 @@ async def test_init_disconnected(self):
             topology_description.server_descriptions(),
             {(host, port): ServerDescription((host, port))},
         )
+
         # address causes client to block until connected
         self.assertIsNotNone(await c.address)
+        # Initial seed topology and connected topology have the same ID
+        self.assertEqual(
+            c._topology._topology_id, topology_description._topology_settings._topology_id
+        )
+
         c = await self.async_rs_or_single_client(connect=False)
         # primary causes client to block until connected
         await c.primary
         self.assertIsNotNone(c._topology)
+
         c = await self.async_rs_or_single_client(connect=False)
         # secondaries causes client to block until connected
         await c.secondaries
         self.assertIsNotNone(c._topology)
+
         c = await self.async_rs_or_single_client(connect=False)
         # arbiters causes client to block until connected
         await c.arbiters
         self.assertIsNotNone(c._topology)
+
         c = await self.async_rs_or_single_client(connect=False)
         # is_primary causes client to block until connected
         self.assertIsInstance(await c.is_primary, bool)
@@ -2194,18 +2203,6 @@ async def test_uuid_queries(self):
         self.assertEqual(2, len(docs))
         await coll.drop()
 
-    async def test_unconnected_client_properties_with_srv(self):
-        client = self.simple_client("mongodb+srv://test1.test.build.10gen.cc/", connect=False)
-        self.assertEqual(client.nodes, frozenset())
-        topology_description = client.topology_description
-        self.assertEqual(topology_description.topology_type, TOPOLOGY_TYPE.Unknown)
-        self.assertEqual(
-            topology_description.server_descriptions(),
-            {("unknown", None): ServerDescription(("unknown", None))},
-        )
-        await client.aconnect()
-        self.assertEqual(await client.address, None)
-
 
 class TestExhaustCursor(AsyncIntegrationTest):
     """Test that clients properly handle errors from exhaust cursors."""

test/test_client.py

@@ -800,20 +800,29 @@ def test_init_disconnected(self):
             topology_description.server_descriptions(),
             {(host, port): ServerDescription((host, port))},
         )
+
         # address causes client to block until connected
         self.assertIsNotNone(c.address)
+        # Initial seed topology and connected topology have the same ID
+        self.assertEqual(
+            c._topology._topology_id, topology_description._topology_settings._topology_id
+        )
+
         c = self.rs_or_single_client(connect=False)
         # primary causes client to block until connected
         c.primary
         self.assertIsNotNone(c._topology)
+
         c = self.rs_or_single_client(connect=False)
         # secondaries causes client to block until connected
         c.secondaries
         self.assertIsNotNone(c._topology)
+
         c = self.rs_or_single_client(connect=False)
         # arbiters causes client to block until connected
         c.arbiters
         self.assertIsNotNone(c._topology)
+
         c = self.rs_or_single_client(connect=False)
         # is_primary causes client to block until connected
         self.assertIsInstance(c.is_primary, bool)
@@ -2151,18 +2160,6 @@ def test_uuid_queries(self):
         self.assertEqual(2, len(docs))
         coll.drop()
 
-    def test_unconnected_client_properties_with_srv(self):
-        client = self.simple_client("mongodb+srv://test1.test.build.10gen.cc/", connect=False)
-        self.assertEqual(client.nodes, frozenset())
-        topology_description = client.topology_description
-        self.assertEqual(topology_description.topology_type, TOPOLOGY_TYPE.Unknown)
-        self.assertEqual(
-            topology_description.server_descriptions(),
-            {("unknown", None): ServerDescription(("unknown", None))},
-        )
-        client._connect()
-        self.assertEqual(client.address, None)
-
 
 class TestExhaustCursor(IntegrationTest):
     """Test that clients properly handle errors from exhaust cursors."""