fixup

nodejs · Feb 7, 2021 · 25856c3 · 25856c3
1 parent ea37a5a
commit 25856c3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/lib/pool.js b/lib/pool.js
@@ -91,21 +91,22 @@ class Pool extends EventEmitter {
   }
 
   get busy () {
-    return this[kPending] > 0
+    return this[kPending] > 0 || (
+      this[kConnections] &&
+      this[kClients].length === this[kConnections] &&
+      this[kClients].every(({ busy }) => busy)
+    )
   }
 
   get pending () {
-    // TODO (perf): This is slow.
     return this[kPending] + this[kClients].reduce((acc, { pending }) => acc + pending, 0)
   }
 
   get running () {
-    // TODO (perf): This is slow.
     return this[kClients].reduce((acc, { running }) => acc + running, 0)
   }
 
   get size () {
-    // TODO (perf): This is slow.
     return this[kPending] + this[kClients].reduce((acc, { size }) => acc + size, 0)
   }
 

diff --git a/test/pool.js b/test/pool.js
@@ -341,7 +341,7 @@ test('backpressure algorithm', (t) => {
 function noop () {}
 
 test('busy', (t) => {
-  t.plan(8 * 8 + 2 + 1)
+  t.plan(8 * 10 + 2 + 1)
 
   const server = createServer((req, res) => {
     t.strictEqual('/', req.url)
@@ -379,8 +379,10 @@ test('busy', (t) => {
           t.strictEqual('hello', Buffer.concat(bufs).toString('utf8'))
         })
       })
-      t.strictEqual(client.pending, Math.max(n - 2, 0))
-      t.strictEqual(client.busy, n > 2)
+      t.strictEqual(client.pending, n)
+      t.strictEqual(client.size, n)
+      t.strictEqual(client.running, 0)
+      t.strictEqual(client.busy, n >= 2)
     }
   })
 })