Pool raises ConnectionFailure, not socket.timeout, after waitQueueTimeoutMS

Author: A. Jesse Jiryu Davis

pymongo/pool.py

@@ -318,7 +318,8 @@ def get_socket(self, pair=None, force=False):
  if not self._socket_semaphore.acquire(False):
  forced = True
  elif not self._socket_semaphore.acquire(True, self.wait_queue_timeout):
- raise socket.timeout()
+ self._raise_wait_queue_timeout()
+
  sock_info, from_pool = None, None
  try:
  try:
@@ -452,7 +453,7 @@ def _check(self, sock_info, pair, acquire_on_connect=False):
  if acquire_on_connect:
  if not self._socket_semaphore.acquire(
  True, self.wait_queue_timeout):
- raise socket.timeout()
+ self._raise_wait_queue_timeout()
  return self.connect(pair)
  except socket.error:
  self.reset()
@@ -503,6 +504,12 @@ def _get_request_state(self):
  tid = self._ident.get()
  return self._tid_to_sock.get(tid, NO_REQUEST)
 
+ def _raise_wait_queue_timeout(self):
+ raise ConnectionFailure(
+ 'Timed out waiting for socket from pool with max_size %r and'
+ ' wait_queue_timeout %r' % (
+ self.max_size, self.wait_queue_timeout))
+
  def __del__(self):
  # Avoid ResourceWarnings in Python 3
  for sock_info in self.sockets:

test/test_pooling_base.py

@@ -30,7 +30,7 @@
 import pymongo.pool
 from pymongo.mongo_client import MongoClient
 from pymongo.pool import Pool, NO_REQUEST, NO_SOCKET_YET, SocketInfo
-from pymongo.errors import ConfigurationError
+from pymongo.errors import ConfigurationError, ConnectionFailure
 from pymongo.thread_util import ExceededMaxWaiters
 from test import version, host, port
 from test.test_client import get_client