Remove timeouts introduced in ARD 006

Reverts big parts of #474

Author: robsdedude

nutkit/frontend/driver.py

@@ -6,8 +6,7 @@ class Driver:
     def __init__(self, backend, uri, auth_token, user_agent=None,
                  resolver_fn=None, domain_name_resolver_fn=None,
                  connection_timeout_ms=None, fetch_size=None,
-                 max_tx_retry_time_ms=None, session_connection_timeout_ms=None,
-                 update_routing_table_timeout_ms=None, encrypted=None,
+                 max_tx_retry_time_ms=None, encrypted=None,
                  trusted_certificates=None, liveness_check_timeout_ms=None,
                  max_connection_pool_size=None,
                  connection_acquisition_timeout_ms=None):
@@ -19,8 +18,6 @@ def __init__(self, backend, uri, auth_token, user_agent=None,
             resolverRegistered=resolver_fn is not None,
             domainNameResolverRegistered=domain_name_resolver_fn is not None,
             connectionTimeoutMs=connection_timeout_ms,
-            sessionConnectionTimeoutMs=session_connection_timeout_ms,
-            updateRoutingTableTimeoutMs=update_routing_table_timeout_ms,
             fetchSize=fetch_size, maxTxRetryTimeMs=max_tx_retry_time_ms,
             encrypted=encrypted, trustedCertificates=trusted_certificates,
             liveness_check_timeout_ms=liveness_check_timeout_ms,

nutkit/protocol/feature.py

@@ -40,13 +40,6 @@ class Feature(Enum):
     # If there are more than records, the driver emits a warning.
     # This method is supposed to always exhaust the result stream.
     API_RESULT_SINGLE_OPTIONAL = "Feature:API:Result.SingleOptional"
-    # The driver offers a configuration option to limit time it spends at most,
-    # trying to acquire a usable read/write connection for any session.
-    # The connection acquisition timeout must account for the whole acquisition
-    # execution time, whether a new connection is created, an idle connection
-    # is picked up instead, we need to wait until the full pool depletes, or
-    # a routing table must be fetched.
-    API_SESSION_CONNECTION_TIMEOUT = "Feature:API:SessionConnectionTimeout"
     # The driver implements explicit configuration options for SSL.
     #  - enable / disable SSL
     #  - verify signature against system store / custom cert / not at all
@@ -60,9 +53,6 @@ class Feature(Enum):
     API_TYPE_SPATIAL = "Feature:API:Type.Spatial"
     # The driver supports sending and receiving temporal data types.
     API_TYPE_TEMPORAL = "Feature:API:Type.Temporal"
-    # The driver offers a configuration option to limit time it spends at most,
-    # trying to update the routing table whenever needed.
-    API_UPDATE_ROUTING_TABLE_TIMEOUT = "Feature:API:UpdateRoutingTableTimeout"
     # The driver supports single-sign-on (SSO) by providing a bearer auth token
     # API.
     AUTH_BEARER = "Feature:Auth:Bearer"

nutkit/protocol/requests.py

@@ -68,7 +68,6 @@ class NewDriver:
     def __init__(
         self, uri, authToken, userAgent=None, resolverRegistered=False,
         domainNameResolverRegistered=False, connectionTimeoutMs=None,
-        sessionConnectionTimeoutMs=None, updateRoutingTableTimeoutMs=None,
         fetchSize=None, maxTxRetryTimeMs=None, encrypted=None,
         trustedCertificates=None, liveness_check_timeout_ms=None,
         max_connection_pool_size=None,
@@ -83,8 +82,6 @@ def __init__(
         self.resolverRegistered = resolverRegistered
         self.domainNameResolverRegistered = domainNameResolverRegistered
         self.connectionTimeoutMs = connectionTimeoutMs
-        self.sessionConnectionTimeoutMs = sessionConnectionTimeoutMs
-        self.updateRoutingTableTimeoutMs = updateRoutingTableTimeoutMs
         self.fetchSize = fetchSize
         self.maxTxRetryTimeMs = maxTxRetryTimeMs
         self.livenessCheckTimeoutMs = liveness_check_timeout_ms

tests/stub/driver_parameters/test_max_connection_pool_size.py

@@ -48,10 +48,6 @@ def _open_driver(self, max_pool_size=None):
             types.Feature.API_CONNECTION_ACQUISITION_TIMEOUT
         ):
             kwargs["connection_acquisition_timeout_ms"] = 500
-        if self.driver_supports_features(
-            types.Feature.API_SESSION_CONNECTION_TIMEOUT
-        ):
-            kwargs["session_connection_timeout_ms"] = 1000
         if max_pool_size is not None:
             kwargs["max_connection_pool_size"] = max_pool_size
         auth = types.AuthorizationToken("basic", principal="neo4j",
@@ -61,12 +57,8 @@ def _open_driver(self, max_pool_size=None):
 
     @contextmanager
     def _backend_timeout_adjustment(self):
-        if any(
-            self.driver_supports_features(feature)
-            for feature in (
-                types.Feature.API_CONNECTION_ACQUISITION_TIMEOUT,
-                types.Feature.API_SESSION_CONNECTION_TIMEOUT,
-            )
+        if self.driver_supports_features(
+            types.Feature.API_CONNECTION_ACQUISITION_TIMEOUT
         ):
             yield
         else: