Merge branch 'PYTHON-2679'

Author: juliusgeo

doc/changelog.rst

@@ -100,6 +100,11 @@ Breaking Changes in 4.0
 - Removed :class:`bson.binary.UUIDLegacy`.
 - The "tls" install extra is no longer necessary or supported and will be
   ignored by pip.
+- ``directConnection`` URI option and keyword argument to :class:`~pymongo
+.mongo_client.MongoClient` defaults to ``False`` instead of ``None``,
+allowing for the automatic discovery of replica sets. This means that if you
+want a direct connection to a single server you must pass
+``directConnection=True`` as a URI option or keyword argument.
 
 Notable improvements
 ....................

doc/migrate-to-pymongo4.rst

@@ -62,6 +62,15 @@ get the same behavior.
 MongoClient
 -----------
 
+``directConnection`` defaults to False
+......................................
+
+``directConnection`` URI option and keyword argument to :class:`~pymongo
+.mongo_client.MongoClient` defaults to ``False`` instead of ``None``,
+allowing for the automatic discovery of replica sets. This means that if you
+want a direct connection to a single server you must pass
+``directConnection=True`` as a URI option or keyword argument.
+
 The waitQueueMultiple parameter is removed
 ..........................................
 
@@ -174,6 +183,7 @@ can be changed to this::
 
     names = client.list_database_names()
 
+
 Database
 --------
 

pymongo/mongo_client.py

@@ -919,13 +919,15 @@ def address(self):
         .. versionadded:: 3.0
         """
         topology_type = self._topology._description.topology_type
-        if topology_type == TOPOLOGY_TYPE.Sharded:
+        if (topology_type == TOPOLOGY_TYPE.Sharded and
+                len(self.topology_description.server_descriptions()) > 1):
             raise InvalidOperation(
                 'Cannot use "address" property when load balancing among'
                 ' mongoses, use "nodes" instead.')
         if topology_type not in (TOPOLOGY_TYPE.ReplicaSetWithPrimary,
                                  TOPOLOGY_TYPE.Single,
-                                 TOPOLOGY_TYPE.LoadBalanced):
+                                 TOPOLOGY_TYPE.LoadBalanced,
+                                 TOPOLOGY_TYPE.Sharded):
             return None
         return self._server_property('address')
 

pymongo/settings.py

@@ -39,7 +39,7 @@ def __init__(self,
                  heartbeat_frequency=common.HEARTBEAT_FREQUENCY,
                  server_selector=None,
                  fqdn=None,
-                 direct_connection=None,
+                 direct_connection=False,
                  load_balanced=None):
         """Represent MongoClient's configuration.
 
@@ -62,10 +62,7 @@ def __init__(self,
         self._fqdn = fqdn
         self._heartbeat_frequency = heartbeat_frequency
 
-        if direct_connection is None:
-            self._direct = (len(self._seeds) == 1 and not self.replica_set_name)
-        else:
-            self._direct = direct_connection
+        self._direct = direct_connection
         self._load_balanced = load_balanced
 
         self._topology_id = ObjectId()

pymongo/topology_description.py

@@ -248,7 +248,8 @@ def apply_local_threshold(selection):
                                              common_wv))
 
         if self.topology_type in (TOPOLOGY_TYPE.Single,
-                                  TOPOLOGY_TYPE.LoadBalanced):
+                                  TOPOLOGY_TYPE.LoadBalanced,
+                                  TOPOLOGY_TYPE.Unknown):
             # Ignore selectors for standalone and load balancer mode.
             return self.known_servers
         elif address:

test/test_sdam_monitoring_spec.py

@@ -21,6 +21,7 @@
 
 sys.path[0:0] = [""]
 
+from pymongo import MongoClient
 from bson.json_util import object_hook
 from pymongo import monitoring
 from pymongo.common import clean_node
@@ -32,7 +33,6 @@
 from pymongo.topology_description import TOPOLOGY_TYPE
 from test import unittest, client_context, client_knobs, IntegrationTest
 from test.utils import (ServerAndTopologyEventListener,
-                        single_client,
                         server_name_to_type,
                         rs_or_single_client,
                         wait_until)
@@ -186,9 +186,9 @@ class NoopMonitor(Monitor):
             def _run(self):
                 time.sleep(0.05)
 
-        m = single_client(h=scenario_def['uri'], p=27017,
-                          event_listeners=[self.all_listener],
-                          _monitor_class=NoopMonitor)
+        m = MongoClient(host=scenario_def['uri'], port=27017,
+                        event_listeners=[self.all_listener],
+                        _monitor_class=NoopMonitor)
         topology = m._get_topology()
 
         try:

test/test_topology.py

@@ -52,13 +52,14 @@ def get_topology_type(self):
 def create_mock_topology(
         seeds=None,
         replica_set_name=None,
-        monitor_class=DummyMonitor):
+        monitor_class=DummyMonitor,
+        direct_connection=False):
     partitioned_seeds = list(map(common.partition_node, seeds or ['a']))
     topology_settings = TopologySettings(
         partitioned_seeds,
         replica_set_name=replica_set_name,
         pool_class=MockPool,
-        monitor_class=monitor_class)
+        monitor_class=monitor_class, direct_connection=direct_connection)
 
     t = Topology(topology_settings)
     t.open()
@@ -166,7 +167,7 @@ def test_direct_connection(self):
                 'ismaster': False,
                 'maxWireVersion': 6}),
         ]:
-            t = create_mock_topology()
+            t = create_mock_topology(direct_connection=True)
 
             # Can't select a server while the only server is of type Unknown.
             with self.assertRaisesRegex(ConnectionFailure,

test/utils.py

@@ -515,14 +515,16 @@ def _connection_string(h, authenticate):
         return "mongodb://%s" % (str(h),)
 
 
-def _mongo_client(host, port, authenticate=True, directConnection=False,
+def _mongo_client(host, port, authenticate=True, directConnection=None,
                   **kwargs):
     """Create a new client over SSL/TLS if necessary."""
     host = host or client_context.host
     port = port or client_context.port
     client_options = client_context.default_client_options.copy()
     if client_context.replica_set_name and not directConnection:
         client_options['replicaSet'] = client_context.replica_set_name
+    if directConnection is not None:
+        client_options['directConnection'] = directConnection
     client_options.update(kwargs)
 
     client = MongoClient(_connection_string(host, authenticate), port,

test/utils_selection_tests.py

@@ -127,7 +127,9 @@ def create_topology(scenario_def, **kwargs):
     topology_type = get_topology_type_name(scenario_def)
     if topology_type == 'LoadBalanced':
         kwargs.setdefault('load_balanced', True)
-
+    # Force topology description to ReplicaSet
+    elif topology_type in ['ReplicaSetNoPrimary', 'ReplicaSetWithPrimary']:
+        kwargs.setdefault('replica_set_name', 'rs')
     settings = get_topology_settings_dict(
         heartbeat_frequency=frequency,
         seeds=seeds,
@@ -145,8 +147,9 @@ def create_topology(scenario_def, **kwargs):
         server_description = make_server_description(server, hosts)
         topology.on_change(server_description)
 
-    if topology_type == 'LoadBalanced':
-        assert topology.description.topology_type_name == 'LoadBalanced'
+    # Assert that descriptions match
+    assert (scenario_def['topology_description']['type'] ==
+           topology.description.topology_type_name)
 
     return topology
 
@@ -252,6 +255,8 @@ class TestAllScenarios(unittest.TestCase):
         dirname = os.path.split(dirname[-2])[-1] + '_' + dirname[-1]
 
         for filename in filenames:
+            if os.path.splitext(filename)[1] != ".json":
+                continue
             with open(os.path.join(dirpath, filename)) as scenario_stream:
                 scenario_def = json_util.loads(scenario_stream.read())