Make connection aquisition timeout also consider the connection creation time

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 or we need to wait until the full pool depletes.

In particular, the connection acquisition timeout (CAT) has precedence over the socket connection timeout (SCT).
If the SCT is set to 2 hours and CAT to 50ms, the connection acquisition should time out after 50ms (as usual, these evil cats win), even if the connection is successfully created within the SCT period.

Note: if SCT is larger than or equal to CAT, a warning should be issued, as this is likely a misconfiguration (and big SCT values won't have any effect on connection acquisitions anyway).

Author: bigmontz

packages/bolt-connection/src/pool/pool.js

@@ -74,51 +74,47 @@ class Pool {
    * @return {Object} resource that is ready to use.
    */
   acquire (address) {
-    return this._acquire(address).then(resource => {
-      const key = address.asKey()
 
-      if (resource) {
-        // New or existing resource acquired
-        return resource
-      }
+    const key = address.asKey()
 
-      // We're out of resources and will try to acquire later on when an existing resource is released.
-      const allRequests = this._acquireRequests
-      const requests = allRequests[key]
-      if (!requests) {
-        allRequests[key] = []
-      }
+    // We're out of resources and will try to acquire later on when an existing resource is released.
+    const allRequests = this._acquireRequests
+    const requests = allRequests[key]
+    if (!requests) {
+      allRequests[key] = []
+    }
 
-      return new Promise((resolve, reject) => {
-        let request
-
-        const timeoutId = setTimeout(() => {
-          // acquisition timeout fired
-
-          // remove request from the queue of pending requests, if it's still there
-          // request might've been taken out by the release operation
-          const pendingRequests = allRequests[key]
-          if (pendingRequests) {
-            allRequests[key] = pendingRequests.filter(item => item !== request)
-          }
-
-          if (request.isCompleted()) {
-            // request already resolved/rejected by the release operation; nothing to do
-          } else {
-            // request is still pending and needs to be failed
-            const activeCount = this.activeResourceCount(address)
-            const idleCount = this.has(address) ? this._pools[key].length : 0
-            request.reject(
-              newError(
-                `Connection acquisition timed out in ${this._acquisitionTimeout} ms. Pool status: Active conn count = ${activeCount}, Idle conn count = ${idleCount}.`
-              )
+    return new Promise((resolve, reject) => {
+      let request
+
+      const timeoutId = setTimeout(() => {
+        // acquisition timeout fired
+
+        // remove request from the queue of pending requests, if it's still there
+        // request might've been taken out by the release operation
+        const pendingRequests = allRequests[key]
+        if (pendingRequests) {
+          allRequests[key] = pendingRequests.filter(item => item !== request)
+        }
+
+        if (request.isCompleted()) {
+          // request already resolved/rejected by the release operation; nothing to do
+        } else {
+          // request is still pending and needs to be failed
+          const activeCount = this.activeResourceCount(address)
+          const idleCount = this.has(address) ? this._pools[key].length : 0
+          request.reject(
+            newError(
+              `Connection acquisition timed out in ${this._acquisitionTimeout} ms. Pool status: Active conn count = ${activeCount}, Idle conn count = ${idleCount}.`
             )
-          }
-        }, this._acquisitionTimeout)
+          )
+        }
+      }, this._acquisitionTimeout)
+
+      request = new PendingRequest(key, resolve, reject, timeoutId, this._log)
+      allRequests[key].push(request)
 
-        request = new PendingRequest(key, resolve, reject, timeoutId, this._log)
-        allRequests[key].push(request)
-      })
+      this._processPendingAcquireRequests(address)
     })
   }
 
@@ -315,7 +311,7 @@ class Pool {
   _processPendingAcquireRequests (address) {
     const key = address.asKey()
     const requests = this._acquireRequests[key]
-    const poolState = this._poolState[key]
+    const poolState = this._poolState[key] || new PoolState()
     if (requests) {
       const pendingRequest = requests.shift() // pop a pending acquire request
 

packages/testkit-backend/src/request-handlers.js

@@ -85,6 +85,9 @@ export function NewDriver (context, data, wire) {
   if ('connectionAcquisitionTimeoutMs' in data) {
     config.connectionAcquisitionTimeout = data.connectionAcquisitionTimeoutMs
   }
+  if ('connectionTimeoutMs' in data) {
+    config.connectionTimeout = data.connectionTimeoutMs
+  }
   if ('fetchSize' in data) {
     config.fetchSize = data.fetchSize
   }
@@ -380,6 +383,7 @@ export function GetFeatures (_context, _params, wire) {
       'Feature:Bolt:4.4',
       'Feature:API:Result.List',
       'Feature:API:Result.Peek',
+      'Feature:Configuruation:ConnectionAcquisitionTimeout',
       'Optimization:EagerTransactionBegin',
       'Optimization:ImplicitDefaultArguments',
       'Optimization:PullPipelining',