Skip to content

Commit

Permalink
cluster: cluster.disconnect() should check status
Browse files Browse the repository at this point in the history
Workers that are already disconnected but not yet exited should not be
disconnected, trying to do so raises exceptions.

PR-URL: nodejs/node-v0.x-archive#8642
Reviewed-by: Bert Belder <bertbelder@gmail.com>
  • Loading branch information
sam-github authored and piscisaureus committed Jan 10, 2015
1 parent 14310e6 commit 092c224
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 1 deletion.
3 changes: 2 additions & 1 deletion lib/cluster.js
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,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);
Expand Down
35 changes: 35 additions & 0 deletions test/parallel/test-cluster-disconnect-before-exit.js
Original file line number Diff line number Diff line change
@@ -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);
}
}

0 comments on commit 092c224

Please sign in to comment.