Change default for Connection and RSC, fix bugs when max_pool_size=None. PYTHON-436

Author: A. Jesse Jiryu Davis

pymongo/connection.py

@@ -44,7 +44,7 @@ class Connection(MongoClient):
  """Connection to MongoDB.
  """
 
- def __init__(self, host=None, port=None, max_pool_size=10,
+ def __init__(self, host=None, port=None, max_pool_size=None,
  network_timeout=None, document_class=dict,
  tz_aware=False, _connect=True, **kwargs):
  """Create a new connection to a single MongoDB instance at *host:port*.
@@ -87,7 +87,7 @@ def __init__(self, host=None, port=None, max_pool_size=10,
  - `max_pool_size` (optional): The maximum number of connections
  that the pool will open simultaneously. If this is set, operations
  will block if there are `max_pool_size` outstanding connections
- from the pool. Defaults to 100.
+ from the pool. By default the pool size is unlimited.
  - `network_timeout` (optional): timeout (in seconds) to use
  for socket operations - default is no timeout
  - `document_class` (optional): default class to use for

pymongo/mongo_client.py

@@ -269,8 +269,8 @@ def __init__(self, host=None, port=None, max_pool_size=100,
  options[option] = value
  options.update(opts)
 
- self.__max_pool_size = common.validate_positive_integer(
-  'max_pool_size', max_pool_size)
+ self.__max_pool_size = common.validate_positive_integer_or_none(
+ 'max_pool_size', max_pool_size)
 
  self.__cursor_manager = CursorManager(self)
 

pymongo/mongo_replica_set_client.py

@@ -634,8 +634,8 @@ def __init__(self, hosts_or_uri=None, max_pool_size=100,
  self.__index_cache = {}
  self.__auth_credentials = {}
 
- self.__max_pool_size = common.validate_positive_integer(
-  'max_pool_size', max_pool_size)
+ self.__max_pool_size = common.validate_positive_integer_or_none(
+ 'max_pool_size', max_pool_size)
  self.__tz_aware = common.validate_boolean('tz_aware', tz_aware)
  self.__document_class = document_class
  self.__monitor = None

pymongo/pool.py

@@ -177,7 +177,7 @@ def __init__(self, pair, max_size, net_timeout, conn_timeout, use_ssl,
  # Count the number of calls to start_request() per thread or greenlet
  self._request_counter = thread_util.Counter(use_greenlets)
 
- if self.wait_queue_multiple is None:
+ if self.wait_queue_multiple is None or self.max_size is None:
  max_waiters = None
  else:
  max_waiters = self.max_size * self.wait_queue_multiple

pymongo/replica_set_connection.py

@@ -41,7 +41,7 @@ class ReplicaSetConnection(MongoReplicaSetClient):
  """Connection to a MongoDB replica set.
  """
 
- def __init__(self, hosts_or_uri=None, max_pool_size=10,
+ def __init__(self, hosts_or_uri=None, max_pool_size=None,
  document_class=dict, tz_aware=False, **kwargs):
  """Create a new connection to a MongoDB replica set.
 
@@ -83,7 +83,7 @@ def __init__(self, hosts_or_uri=None, max_pool_size=10,
  - `max_pool_size` (optional): The maximum number of connections
  each pool will open simultaneously. If this is set, operations
  will block if there are `max_pool_size` outstanding connections
- from the pool. Defaults to 100.
+ from the pool. By default the pool size is unlimited.
  - `document_class` (optional): default class to use for
  documents returned from queries on this connection
  - `tz_aware` (optional): if ``True``,

test/test_legacy_connections.py

@@ -34,6 +34,7 @@ class TestConnection(unittest.TestCase):
  def test_connection(self):
  c = Connection(host, port)
  self.assertTrue(c.auto_start_request)
+ self.assertEqual(None, c.max_pool_size)
  self.assertFalse(c.slave_okay)
  self.assertFalse(c.safe)
  self.assertEqual({}, c.get_lasterror_options())
@@ -67,6 +68,7 @@ class TestReplicaSetConnection(TestReplicaSetClientBase):
  def test_replica_set_connection(self):
  c = ReplicaSetConnection(pair, replicaSet=self.name)
  self.assertTrue(c.auto_start_request)
+ self.assertEqual(None, c.max_pool_size)
  self.assertFalse(c.slave_okay)
  self.assertFalse(c.safe)
  self.assertEqual({}, c.get_lasterror_options())