Skip to content

Fix #796: connection pool clogging up #804

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
robsdedude merged 3 commits into from
Sep 19, 2022
Merged

Fix #796: connection pool clogging up #804

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
454f6de
Fix #796: connection pool clogging up
robsdedude Sep 16, 2022
1eb4377
Merge branch '5.0' into fix-pool-clogging
robsdedude Sep 16, 2022
75a77e8
Add unit tests
robsdedude Sep 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions neo4j/_async/io/_pool.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
defaultdict,
deque,
)
from contextlib import asynccontextmanager
from logging import getLogger
from random import choice

Expand Down Expand Up @@ -161,11 +160,10 @@ async def connection_creator():
connections = self.connections[address]
pool_size = (len(connections)
+ self.connections_reservations[address])
can_create_new_connection = (infinite_pool_size
or pool_size < max_pool_size)
self.connections_reservations[address] += 1
if can_create_new_connection:
return connection_creator
if infinite_pool_size or pool_size < max_pool_size:
# there's room for a new connection
self.connections_reservations[address] += 1
return connection_creator
return None

async def _acquire(self, address, deadline, liveness_check_timeout):
Expand Down
10 changes: 4 additions & 6 deletions neo4j/_sync/io/_pool.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
defaultdict,
deque,
)
from contextlib import contextmanager
from logging import getLogger
from random import choice

Expand Down Expand Up @@ -161,11 +160,10 @@ def connection_creator():
connections = self.connections[address]
pool_size = (len(connections)
+ self.connections_reservations[address])
can_create_new_connection = (infinite_pool_size
or pool_size < max_pool_size)
self.connections_reservations[address] += 1
if can_create_new_connection:
return connection_creator
if infinite_pool_size or pool_size < max_pool_size:
# there's room for a new connection
self.connections_reservations[address] += 1
return connection_creator
return None

def _acquire(self, address, deadline, liveness_check_timeout):
Expand Down