cluster: reset handle index on close

It allows reopening a server after it has been closed. Fixes: #6693 PR-URL: #6981 Reviewed-By: Ben Noordhuis <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Ron Korving <[email protected]> Reviewed-By: James M Snell <[email protected]>

Author: santigimeno

lib/cluster.js

@@ -555,18 +555,18 @@ function workerInit(){
 
 // obj is a net#Server or a dgram#Socket object.
 cluster._getServer=function(obj,options,cb){
-constkey=[options.address,
-options.port,
-options.addressType,
-options.fd].join(':');
-if(indexes[key]===undefined)
-indexes[key]=0;
+constindexesKey=[options.address,
+options.port,
+options.addressType,
+options.fd].join(':');
+if(indexes[indexesKey]===undefined)
+indexes[indexesKey]=0;
 else
-indexes[key]++;
+indexes[indexesKey]++;
 
 constmessage=util._extend({
 act: 'queryServer',
-index: indexes[key],
+index: indexes[indexesKey],
 data: null
 },options);
 
@@ -576,9 +576,9 @@ function workerInit(){
 if(obj._setServerData)obj._setServerData(reply.data);
 
 if(handle)
-shared(reply,handle,cb);// Shared listen socket.
+shared(reply,handle,indexesKey,cb);// Shared listen socket.
 else
-rr(reply,cb);// Round-robin.
+rr(reply,indexesKey,cb);// Round-robin.
 });
 obj.once('listening',function(){
 cluster.worker.state='listening';
@@ -590,14 +590,15 @@ function workerInit(){
 };
 
 // Shared listen socket.
-functionshared(message,handle,cb){
+functionshared(message,handle,indexesKey,cb){
 varkey=message.key;
 // Monkey-patch the close() method so we can keep track of when it's
 // closed. Avoids resource leaks when the handle is short-lived.
 varclose=handle.close;
 handle.close=function(){
 send({act: 'close',key: key});
 deletehandles[key];
+deleteindexes[indexesKey];
 returnclose.apply(this,arguments);
 };
 assert(handles[key]===undefined);
@@ -606,7 +607,7 @@ function workerInit(){
 }
 
 // Round-robin. Master distributes handles across workers.
-functionrr(message,cb){
+functionrr(message,indexesKey,cb){
 if(message.errno)
 returncb(message.errno,null);
 
@@ -627,6 +628,7 @@ function workerInit(){
 if(key===undefined)return;
 send({act: 'close',key: key});
 deletehandles[key];
+deleteindexes[indexesKey];
 key=undefined;
 }
 

test/parallel/test-cluster-server-restart-none.js

@@ -0,0 +1,37 @@
+'use strict';
+constcommon=require('../common');
+constassert=require('assert');
+constcluster=require('cluster');
+
+cluster.schedulingPolicy=cluster.SCHED_NONE;
+
+if(cluster.isMaster){
+constworker1=cluster.fork();
+worker1.on('listening',common.mustCall(()=>{
+constworker2=cluster.fork();
+worker2.on('exit',(code,signal)=>{
+assert.strictEqual(code,0,'worker2 did not exit normally');
+assert.strictEqual(signal,null,'worker2 did not exit normally');
+worker1.disconnect();
+});
+}));
+
+worker1.on('exit',common.mustCall((code,signal)=>{
+assert.strictEqual(code,0,'worker1 did not exit normally');
+assert.strictEqual(signal,null,'worker1 did not exit normally');
+}));
+}else{
+constnet=require('net');
+constserver=net.createServer();
+server.listen(common.PORT,common.mustCall(()=>{
+if(cluster.worker.id===2){
+server.close(()=>{
+server.listen(common.PORT,common.mustCall(()=>{
+server.close(()=>{
+process.disconnect();
+});
+}));
+});
+}
+}));
+}

test/parallel/test-cluster-server-restart-rr.js

@@ -0,0 +1,37 @@
+'use strict';
+constcommon=require('../common');
+constassert=require('assert');
+constcluster=require('cluster');
+
+cluster.schedulingPolicy=cluster.SCHED_RR;
+
+if(cluster.isMaster){
+constworker1=cluster.fork();
+worker1.on('listening',common.mustCall(()=>{
+constworker2=cluster.fork();
+worker2.on('exit',(code,signal)=>{
+assert.strictEqual(code,0,'worker2 did not exit normally');
+assert.strictEqual(signal,null,'worker2 did not exit normally');
+worker1.disconnect();
+});
+}));
+
+worker1.on('exit',common.mustCall((code,signal)=>{
+assert.strictEqual(code,0,'worker1 did not exit normally');
+assert.strictEqual(signal,null,'worker1 did not exit normally');
+}));
+}else{
+constnet=require('net');
+constserver=net.createServer();
+server.listen(common.PORT,common.mustCall(()=>{
+if(cluster.worker.id===2){
+server.close(()=>{
+server.listen(common.PORT,common.mustCall(()=>{
+server.close(()=>{
+process.disconnect();
+});
+}));
+});
+}
+}));
+}