Skip to content

Clean-up connection pool respecting unresolved addresses #600

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 2 commits into from
Oct 8, 2021
Merged

Clean-up connection pool respecting unresolved addresses #600

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0e1219d
Check unresolved address when removing connections from pool
robsdedude Oct 7, 2021
87500bb
Merge branch '4.4' into resolve-all-routing-table-addresses
robsdedude Oct 7, 2021
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
8 changes: 8 additions & 0 deletions neo4j/addressing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,10 @@ def host(self):
def port(self):
return self[1]

@property
def unresolved(self):
return self

@classmethod
def _dns_resolve(cls, address, family=0):
""" Regular DNS resolver. Takes an address object and optional
Expand Down Expand Up @@ -226,6 +230,10 @@ class ResolvedAddress(Address):
def host_name(self):
return self._host_name

@property
def unresolved(self):
return (self._host_name, *self[1:])

def resolve(self, family=0, resolver=None):
return [self]

Expand Down
2 changes: 1 addition & 1 deletion neo4j/io/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1070,7 +1070,7 @@ def update_routing_table(self, *, database, bookmarks):
def update_connection_pool(self, *, database):
servers = self.routing_tables[database].servers()
for address in list(self.connections):
if address not in servers:
if address.unresolved not in servers:
super(Neo4jPool, self).deactivate(address)

def ensure_routing_table_is_fresh(self, *, access_mode, database,
Expand Down
18 changes: 0 additions & 18 deletions testkitbackend/test_config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,5 @@
{
"skips": {
"stub.routing.test_routing_v4x1.RoutingV4x1.test_should_retry_write_until_success_with_leader_change_using_tx_function":
"Driver closes connection to router if DNS resolved name not in routing table",
"stub.routing.test_routing_v3.RoutingV3.test_should_retry_write_until_success_with_leader_change_using_tx_function":
"Driver closes connection to router if DNS resolved name not in routing table",
"stub.routing.test_routing_v4x3.RoutingV4x3.test_should_retry_write_until_success_with_leader_change_using_tx_function":
"Driver closes connection to router if DNS resolved name not in routing table",
"stub.routing.test_routing_v4x1.RoutingV4x1.test_should_retry_write_until_success_with_leader_change_on_run_using_tx_function":
"Driver closes connection to router if DNS resolved name not in routing table",
"stub.routing.test_routing_v3.RoutingV3.test_should_retry_write_until_success_with_leader_change_on_run_using_tx_function":
"Driver closes connection to router if DNS resolved name not in routing table",
"stub.routing.test_routing_v4x3.RoutingV4x3.test_should_retry_write_until_success_with_leader_change_on_run_using_tx_function":
"Driver closes connection to router if DNS resolved name not in routing table",
"stub.routing.test_routing_v4x1.RoutingV4x1.test_should_retry_write_until_success_with_leader_shutdown_during_tx_using_tx_function":
"Driver closes connection to router if DNS resolved name not in routing table",
"stub.routing.test_routing_v3.RoutingV3.test_should_retry_write_until_success_with_leader_shutdown_during_tx_using_tx_function":
"Driver closes connection to router if DNS resolved name not in routing table",
"stub.routing.test_routing_v4x3.RoutingV4x3.test_should_retry_write_until_success_with_leader_shutdown_during_tx_using_tx_function":
"Driver closes connection to router if DNS resolved name not in routing table",
"stub.routing.test_routing_v4x1.RoutingV4x1.test_should_successfully_acquire_rt_when_router_ip_changes":
"Test makes assumptions about how verify_connectivity is implemented",
"stub.routing.test_routing_v3.RoutingV3.test_should_successfully_acquire_rt_when_router_ip_changes":
Expand Down