nodejs
diff --git a/‎lib/internal/cluster/round_robin_handle.js‎
Lines changed: 11 additions & 8 deletions b/‎lib/internal/cluster/round_robin_handle.js‎
Lines changed: 11 additions & 8 deletions
diff --git a/‎lib/internal/linkedlist.js‎
Lines changed: 1 addition & 0 deletions b/‎lib/internal/linkedlist.js‎
Lines changed: 1 addition & 0 deletions
@@ -2,15 +2,15 @@
 
 const {
   ArrayIsArray,
-  ArrayPrototypePush,
-  ArrayPrototypeShift,
   Boolean,
+  ObjectCreate,
   SafeMap,
 } = primordials;
 
 const assert = require('internal/assert');
 const net = require('net');
 const { sendHelper } = require('internal/cluster/utils');
+const { append, init, isEmpty, peek, remove } = require('internal/linkedlist');
 const { constants } = internalBinding('tcp_wrap');
 
 module.exports = RoundRobinHandle;
@@ -19,7 +19,7 @@ function RoundRobinHandle(key, address, { port, fd, flags }) {
   this.key = key;
   this.all = new SafeMap();
   this.free = new SafeMap();
-  this.handles = [];
+  this.handles = init(ObjectCreate(null));
   this.handle = null;
   this.server = net.createServer(assert.fail);
 
@@ -81,18 +81,19 @@ RoundRobinHandle.prototype.remove = function(worker) {
   if (this.all.size !== 0)
     return false;
 
-  for (const handle of this.handles) {
+  while (!isEmpty(this.handles)) {
+    const handle = peek(this.handles);
     handle.close();
+    remove(handle);
   }
-  this.handles = [];
 
   this.handle.close();
   this.handle = null;
   return true;
 };
 
 RoundRobinHandle.prototype.distribute = function(err, handle) {
-  ArrayPrototypePush(this.handles, handle);
+  append(this.handles, handle);
   // eslint-disable-next-line node-core/no-array-destructuring
   const [ workerEntry ] = this.free; // this.free is a SafeMap
 
@@ -108,13 +109,15 @@ RoundRobinHandle.prototype.handoff = function(worker) {
     return;  // Worker is closing (or has closed) the server.
   }
 
-  const handle = ArrayPrototypeShift(this.handles);
+  const handle = peek(this.handles);
 
-  if (handle === undefined) {
+  if (handle === null) {
     this.free.set(worker.id, worker);  // Add to ready queue again.
     return;
   }
 
+  remove(handle);
+
   const message = { act: 'newconn', key: this.key };
 
   sendHelper(worker.process, message, handle, (reply) => {
 
@@ -3,6 +3,7 @@
 function init(list) {
   list._idleNext = list;
   list._idlePrev = list;
+  return list;
 }
 
 // Show the most idle item.
Original file line number	Diff line number	Diff line change
@@ -3,6 +3,7 @@
3	3	function init(list) {
4	4	list._idleNext = list;
5	5	list._idlePrev = list;
	6	+ return list;
6	7	}
7	8
8	9	// Show the most idle item.