Support for Elasticsearch 7.7 (#1192)

lib/pool/ConnectionPool.js

@@ -35,13 +35,10 @@ class ConnectionPool extends BaseConnectionPool {
    * Marks a connection as 'alive'.
    * If needed removes the connection from the dead list
    * and then resets the `deadCount`.
-   * If sniffing is not enabled and there is only
-   * one node, this method is a noop.
    *
    * @param {object} connection
    */
   markAlive (connection) {
-    if (this._sniffEnabled === false && this.size === 1) return this
     const { id } = connection
     debug(`Marking as 'alive' connection '${id}'`)
     const index = this.dead.indexOf(id)
@@ -56,13 +53,10 @@ class ConnectionPool extends BaseConnectionPool {
    * Marks a connection as 'dead'.
    * If needed adds the connection to the dead list
    * and then increments the `deadCount`.
-   * If sniffing is not enabled and there is only
-   * one node, this method is a noop.
    *
    * @param {object} connection
    */
   markDead (connection) {
-    if (this._sniffEnabled === false && this.size === 1) return this
     const { id } = connection
     debug(`Marking as 'dead' connection '${id}'`)
     if (this.dead.indexOf(id) === -1) {
@@ -158,7 +152,7 @@ class ConnectionPool extends BaseConnectionPool {
 
   /**
    * Returns an alive connection if present,
-   * otherwise returns null.
+   * otherwise returns a dead connection.
    * By default it filters the `master` only nodes.
    * It uses the selector to choose which
    * connection return.
@@ -176,11 +170,13 @@ class ConnectionPool extends BaseConnectionPool {
       name: opts.name
     })
 
+    const noAliveConnections = this.size === this.dead.length
+
     // TODO: can we cache this?
     const connections = []
     for (var i = 0; i < this.size; i++) {
       const connection = this.connections[i]
-      if (connection.status === Connection.statuses.ALIVE) {
+      if (noAliveConnections || connection.status === Connection.statuses.ALIVE) {
         if (filter(connection) === true) {
           connections.push(connection)
         }
@@ -212,13 +208,7 @@ class ConnectionPool extends BaseConnectionPool {
    */
   update (connections) {
     super.update(connections)
-
-    for (var i = 0; i < this.dead.length; i++) {
-      if (this.connections.find(c => c.id === this.dead[i]) === undefined) {
-        this.dead.splice(i, 1)
-      }
-    }
-
+    this.dead = []
     return this
   }
 }