signo = signo || 'SIGTERM';
var proc = this.process;
if (proc.connected) {
- proc.once('disconnect', proc.kill.bind(proc, signo));
- proc.disconnect();
+ this.once('disconnect', proc.kill.bind(proc, signo));
+ this.disconnect();
return;
}
proc.kill(signo);
worker.id = +process.env.NODE_UNIQUE_ID | 0;
worker.state = 'online';
worker.process = process;
- process.once('disconnect', process.exit.bind(null, 0));
+ process.once('disconnect', function() {
+ if (!worker.suicide) {
+ // Unexpected disconnect, master exited, or some such nastiness, so
+ // worker exits immediately.
+ process.exit(0);
+ }
+ });
process.on('internalMessage', internal(worker, onmessage));
send({ act: 'online' });
function onmessage(message, handle) {
}
Worker.prototype.disconnect = function() {
+ this.suicide = true;
for (var key in handles) {
var handle = handles[key];
delete handles[key];
};
Worker.prototype.destroy = function() {
+ this.suicide = true;
if (!process.connected) process.exit(0);
var exit = process.exit.bind(null, 0);
send({ act: 'suicide' }, exit);
cluster.disconnect(common.mustCall(function() {
assert.deepEqual(Object.keys(cluster.workers), []);
}));
-} else {
- setTimeout(assert.fail, 1e6);
}
--- /dev/null
+// 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 assert = require('assert');
+var cluster = require('cluster')
+var net = require('net');
+
+var SENTINEL = 42;
+
+// workers forcibly exit when control channel is disconnected, if
+// their .suicide flag isn't set
+//
+// test this by:
+//
+// 1 setup worker to wait a short time after disconnect, and exit
+// with a sentinel value
+// 2 disconnect worker with cluster's disconnect, confirm sentinel
+// 3 disconnect worker with child_process's disconnect, confirm
+// no sentinel value
+if (cluster.isWorker) {
+ process.on('disconnect', function(msg) {
+ setTimeout(function() {
+ process.exit(SENTINEL);
+ }, 10);
+ });
+ return;
+}
+
+var unforcedOk;
+var forcedOk;
+
+process.on('exit', function() {
+ assert(forcedOk);
+ assert(unforcedOk);
+});
+
+checkUnforced();
+checkForced();
+
+function checkUnforced() {
+ cluster.fork()
+ .on('online', function() {
+ this.disconnect();
+ })
+ .on('exit', function(status) {
+ assert.equal(status, SENTINEL);
+ unforcedOk = true;
+ });
+}
+
+function checkForced() {
+ cluster.fork()
+ .on('online', function() {
+ this.process.disconnect();
+ })
+ .on('exit', function(status) {
+ assert.equal(status, 0);
+ forcedOk = true;
+ });
+}
--- /dev/null
+// 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 assert = require('assert');
+var cluster = require('cluster')
+var net = require('net');
+
+var destroyed;
+var success;
+var worker;
+var server;
+
+// workers do not exit on disconnect, they exit under normal node rules: when
+// they have nothing keeping their loop alive, like an active connection
+//
+// test this by:
+//
+// 1 creating a server, so worker can make a connection to something
+// 2 disconnecting worker
+// 3 wait to confirm it did not exit
+// 4 destroy connection
+// 5 confirm it does exit
+if (cluster.isMaster) {
+ server = net.createServer(function(conn) {
+ server.close();
+ worker.disconnect()
+ worker.once('disconnect', function() {
+ setTimeout(function() {
+ conn.destroy();
+ destroyed = true;
+ }, 1000);
+ }).once('exit', function() {
+ // worker should not exit while it has a connection
+ assert(destroyed, 'worker exited before connection destroyed');
+ success = true;
+ });
+
+ }).listen(0, function() {
+ var port = this.address().port;
+
+ worker = cluster.fork()
+ .on('online', function() {
+ this.send({port: port});
+ });
+ });
+ process.on('exit', function() {
+ assert(success);
+ });
+} else {
+ process.on('message', function(msg) {
+ // we shouldn't exit, not while a network connection exists
+ net.connect(msg.port);
+ });
+}