Browse Source

cluster: report more errors to workers

Some errors for listening and binding to a socket were not properly
delivered to workers.

fix #6767
v0.10.25-release
Fedor Indutny 11 years ago
committed by Timothy J Fontaine
parent
commit
3e9f2e61db
  1. 19
      lib/cluster.js
  2. 5
      lib/dgram.js
  3. 9
      lib/net.js
  4. 59
      test/simple/test-cluster-eaccess.js

19
lib/cluster.js

@ -228,13 +228,18 @@ if (cluster.isMaster) {
if (serverHandlers.hasOwnProperty(key)) {
handler = serverHandlers[key];
} else if (message.addressType === 'udp4' ||
message.addressType === 'udp6') {
var dgram = require('dgram');
handler = dgram._createSocketHandle.apply(net, args);
serverHandlers[key] = handler;
} else {
handler = net._createServerHandle.apply(net, args);
if (message.addressType === 'udp4' ||
message.addressType === 'udp6') {
var dgram = require('dgram');
handler = dgram._createSocketHandle.apply(net, args);
} else {
handler = net._createServerHandle.apply(net, args);
}
if (!handler) {
send({ content: { error: process._errno } }, null);
return;
}
serverHandlers[key] = handler;
}
@ -584,7 +589,7 @@ cluster._getServer = function(tcpSelf, address, port, addressType, fd, cb) {
// The callback will be stored until the master has responded
sendInternalMessage(cluster.worker, message, function(msg, handle) {
cb(handle);
cb(handle, msg && msg.error);
});
};

5
lib/dgram.js

@ -190,7 +190,10 @@ Socket.prototype.bind = function(/*port, address, callback*/) {
cluster = require('cluster');
if (cluster.isWorker) {
cluster._getServer(self, ip, port, self.type, -1, function(handle) {
cluster._getServer(self, ip, port, self.type, -1, function(handle, err) {
if (err)
return self.emit('error', errnoException(err, 'bind'));
if (!self._handle)
// handle has been closed in the mean time.
return handle.close();

9
lib/net.js

@ -1062,7 +1062,14 @@ function listen(self, address, port, addressType, backlog, fd) {
return;
}
cluster._getServer(self, address, port, addressType, fd, function(handle) {
cluster._getServer(self, address, port, addressType, fd, function(handle,
err) {
// EACCESS and friends
if (err) {
self.emit('error', errnoException(err, 'bind'));
return;
}
// Some operating systems (notably OS X and Solaris) don't report EADDRINUSE
// errors right away. libuv mimics that behavior for the sake of platform
// consistency but that means we have have a socket on our hands that is

59
test/simple/test-cluster-eaccess.js

@ -0,0 +1,59 @@
// 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 common = require('../common');
var assert = require('assert');
var cluster = require('cluster');
var path = require('path');
var fs = require('fs');
var net = require('net');
// No win32 support so far
if (process.platform === 'win32')
return;
var socketPath = path.join(common.fixturesDir, 'socket-path');
if (cluster.isMaster) {
cluster.fork();
} else {
fs.writeFileSync(socketPath, 'some contents');
var server = net.createServer().listen(socketPath, function() {
console.log('here');
});
var gotError = 0;
server.on('error', function(err) {
gotError++;
assert(/EADDRINUSE/.test(err.message));
process.exit();
});
process.on('exit', function() {
try {
fs.unlinkSync(socketPath);
} catch (e) {
}
assert.equal(gotError, 1);
});
}
Loading…
Cancel
Save