lib/cluster.js

@@ -101,7 +101,7 @@ SharedHandle.prototype.add = function(worker, send) {
 
 SharedHandle.prototype.remove = function(worker) {
   var index = this.workers.indexOf(worker);
-  assert(index !== -1);
+  if (index === -1) return false; // The worker wasn't sharing this handle.
   this.workers.splice(index, 1);
   if (this.workers.length !== 0) return false;
   this.handle.close();
@@ -407,7 +407,8 @@ function masterInit() {
     } else {
       for (var key in workers) {
         key = workers[key];
-        cluster.workers[key].disconnect();
+        if (cluster.workers[key].isConnected())
+          cluster.workers[key].disconnect();
       }
     }
     if (cb) intercom.once('disconnect', cb);

test/simple/test-cluster-disconnect-before-exit.js

@@ -0,0 +1,35 @@
+// Copyright Joyent, Inc. and other Node contributors.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+var cluster = require('cluster');
+
+if (cluster.isMaster) {
+  var worker = cluster.fork().on('online', disconnect);
+
+  function disconnect() {
+    worker.disconnect();
+    // The worker remains in cluster.workers until both disconnect AND exit.
+    // Disconnect is supposed to disconnect all workers, but not workers that
+    // are already disconnected, since calling disconnect() on an already
+    // disconnected worker would error.
+    worker.on('disconnect', cluster.disconnect);
+  }
+}

test/simple/test-cluster-disconnect-unshared-tcp.js

@@ -0,0 +1,44 @@
+// Copyright Joyent, Inc. and other Node contributors.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+process.env.NODE_CLUSTER_SCHED_POLICY = 'none';
+
+var cluster = require('cluster');
+var net = require('net');
+
+if (cluster.isMaster) {
+  var unbound = cluster.fork().on('online', bind);
+
+  function bind() {
+    cluster.fork({BOUND: 'y'}).on('listening', disconnect);
+  }
+
+  function disconnect() {
+    unbound.disconnect();
+    unbound.on('disconnect', cluster.disconnect);
+  }
+} else {
+  if (process.env.BOUND === 'y') {
+    var source = net.createServer()
+
+    source.listen(0);
+  }
+}

test/simple/test-cluster-disconnect-unshared-udp.js

@@ -0,0 +1,47 @@
+// Copyright Joyent, Inc. and other Node contributors.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+if (process.platform === 'win32') {
+  console.log('skipping test on windows, where clustered dgram is ENOTSUP');
+  process.exit(0);
+}
+
+var cluster = require('cluster');
+var dgram = require('dgram');
+
+if (cluster.isMaster) {
+  var unbound = cluster.fork().on('online', bind);
+
+  function bind() {
+    cluster.fork({BOUND: 'y'}).on('listening', disconnect);
+  }
+
+  function disconnect() {
+    unbound.disconnect();
+    unbound.on('disconnect', cluster.disconnect);
+  }
+} else {
+  if (process.env.BOUND === 'y') {
+    var source = dgram.createSocket('udp4');
+
+    source.bind(0);
+  }
+}