mongodb/mongo-python-driver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pool must release its semaphore on connection failure. PYTHON-580

Browse Source
This commit is contained in:
A. Jesse Jiryu Davis 2013-10-07 11:42:04 -04:00
parent a633a4111d
commit 3db63c45a6
1 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
pymongo/pool.py
View File

@ -324,28 +324,33 @@ class Pool:
elif not self._socket_semaphore.acquire(True, self.wait_queue_timeout):
self._raise_wait_queue_timeout()
sock_info, from_pool = None, None
# We've now acquired the semaphore and must release it on error.
try:
sock_info, from_pool = None, None
try:
# set.pop() isn't atomic in Jython less than 2.7, see
# http://bugs.jython.org/issue1854
self.lock.acquire()
sock_info, from_pool = self.sockets.pop(), True
finally:
self.lock.release()
except KeyError:
sock_info, from_pool = self.connect(pair), False
try:
# set.pop() isn't atomic in Jython less than 2.7, see
# http://bugs.jython.org/issue1854
self.lock.acquire()
sock_info, from_pool = self.sockets.pop(), True
finally:
self.lock.release()
except KeyError:
sock_info, from_pool = self.connect(pair), False
if from_pool:
sock_info = self._check(sock_info, pair)
if from_pool:
sock_info = self._check(sock_info, pair)
sock_info.forced = forced
sock_info.forced = forced
if req_state == NO_SOCKET_YET:
# start_request has been called but we haven't assigned a socket to
# the request yet. Let's use this socket for this request until
# end_request.
self._set_request_state(sock_info)
if req_state == NO_SOCKET_YET:
# start_request has been called but we haven't assigned a
# socket to the request yet. Let's use this socket for this
# request until end_request.
self._set_request_state(sock_info)
except:
self._socket_semaphore.release()
raise
sock_info.last_checkout = time.time()
return sock_info