mirror of https://github.com/lukechilds/node.git
Browse Source
Implement support for debugging cluster workers. Each worker process is assigned a new debug port in an increasing sequence. I.e. when master process uses port 5858, then worker 1 uses port 5859, worker 2 uses port 5860, and so on. Introduce new command-line parameter '--debug-port=' which sets debug_port but does not start debugger. This option works for all node processes, it is not specific to cluster workers. Fixes joyent/node#5318.v0.11.2-release
Miroslav Bajtoš
12 years ago
committed by
Ben Noordhuis
7 changed files with 397 additions and 20 deletions
@ -0,0 +1,25 @@ |
|||
var http = require('http'); |
|||
var cluster = require('cluster'); |
|||
var common = require('../../common.js'); |
|||
|
|||
function handleRequest(request, response) { |
|||
response.end('hello world\n'); |
|||
} |
|||
|
|||
var NUMBER_OF_WORKERS = 2; |
|||
var workersOnline = 0; |
|||
|
|||
if (cluster.isMaster) { |
|||
cluster.on('online', function() { |
|||
workersOnline++; |
|||
if (workersOnline == NUMBER_OF_WORKERS) |
|||
console.error('all workers are running'); |
|||
}); |
|||
|
|||
for (var i = 0; i < NUMBER_OF_WORKERS; i++) { |
|||
cluster.fork(); |
|||
} |
|||
} else { |
|||
var server = http.createServer(handleRequest); |
|||
server.listen(common.PORT+1000); |
|||
} |
@ -0,0 +1,68 @@ |
|||
// 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 spawn = require('child_process').spawn; |
|||
|
|||
var args = ['--debug', common.fixturesDir + '/clustered-server/app.js' ]; |
|||
var child = spawn(process.execPath, args); |
|||
var outputLines = []; |
|||
|
|||
|
|||
child.stderr.on('data', function(data) { |
|||
var lines = data.toString().replace(/\r/g, '').trim().split('\n'); |
|||
var line = lines[0]; |
|||
|
|||
lines.forEach(function(ln) { console.log('> ' + ln) } ); |
|||
|
|||
if (line === 'all workers are running') { |
|||
assertOutputLines(); |
|||
process.exit(); |
|||
} else { |
|||
outputLines = outputLines.concat(lines); |
|||
} |
|||
}); |
|||
|
|||
setTimeout(function testTimedOut() { |
|||
assert(false, 'test timed out.'); |
|||
}, 3000); |
|||
|
|||
process.on('exit', function() { |
|||
child.kill(); |
|||
}); |
|||
|
|||
function assertOutputLines() { |
|||
var expectedLines = [ |
|||
'debugger listening on port ' + 5858, |
|||
'debugger listening on port ' + 5859, |
|||
'debugger listening on port ' + 5860, |
|||
]; |
|||
|
|||
// Do not assume any particular order of output messages,
|
|||
// since workers can take different amout of time to
|
|||
// start up
|
|||
outputLines.sort(); |
|||
|
|||
assert.equal(outputLines.length, expectedLines.length) |
|||
for (var i = 0; i < expectedLines.length; i++) |
|||
assert.equal(outputLines[i], expectedLines[i]); |
|||
} |
@ -0,0 +1,73 @@ |
|||
// 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 spawn = require('child_process').spawn; |
|||
|
|||
var port = common.PORT + 1337; |
|||
|
|||
var args = [ |
|||
'--debug=' + port, |
|||
common.fixturesDir + '/clustered-server/app.js' |
|||
]; |
|||
|
|||
var child = spawn(process.execPath, args); |
|||
var outputLines = []; |
|||
|
|||
child.stderr.on('data', function(data) { |
|||
var lines = data.toString().replace(/\r/g, '').trim().split('\n'); |
|||
var line = lines[0]; |
|||
|
|||
lines.forEach(function(ln) { console.log('> ' + ln) } ); |
|||
|
|||
if (line === 'all workers are running') { |
|||
assertOutputLines(); |
|||
process.exit(); |
|||
} else { |
|||
outputLines = outputLines.concat(lines); |
|||
} |
|||
}); |
|||
|
|||
setTimeout(function testTimedOut() { |
|||
assert(false, 'test timed out.'); |
|||
}, 3000); |
|||
|
|||
process.on('exit', function() { |
|||
child.kill(); |
|||
}); |
|||
|
|||
function assertOutputLines() { |
|||
var expectedLines = [ |
|||
'debugger listening on port ' + port, |
|||
'debugger listening on port ' + (port+1), |
|||
'debugger listening on port ' + (port+2), |
|||
]; |
|||
|
|||
// Do not assume any particular order of output messages,
|
|||
// since workers can take different amout of time to
|
|||
// start up
|
|||
outputLines.sort(); |
|||
|
|||
assert.equal(outputLines.length, expectedLines.length) |
|||
for (var i = 0; i < expectedLines.length; i++) |
|||
assert.equal(outputLines[i], expectedLines[i]); |
|||
} |
@ -0,0 +1,74 @@ |
|||
// 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 spawn = require('child_process').spawn; |
|||
|
|||
var debugPort = common.PORT; |
|||
var args = ['--debug-port=' + debugPort]; |
|||
var child = spawn(process.execPath, args); |
|||
|
|||
child.stderr.on('data', function(data) { |
|||
var lines = data.toString().replace(/\r/g, '').trim().split('\n'); |
|||
lines.forEach(processStderrLine); |
|||
}); |
|||
|
|||
setTimeout(testTimedOut, 3000); |
|||
function testTimedOut() { |
|||
assert(false, 'test timed out.'); |
|||
} |
|||
|
|||
// Give the child process small amout of time to start
|
|||
setTimeout(function() { |
|||
process._debugProcess(child.pid); |
|||
}, 100); |
|||
|
|||
process.on('exit', function() { |
|||
child.kill(); |
|||
}); |
|||
|
|||
var outputLines = []; |
|||
function processStderrLine(line) { |
|||
console.log('> ' + line); |
|||
outputLines.push(line); |
|||
|
|||
if (/debugger listening/.test(line)) { |
|||
assertOutputLines(); |
|||
process.exit(); |
|||
} |
|||
} |
|||
|
|||
function assertOutputLines() { |
|||
var startLog = process.platform === 'win32' |
|||
? 'Starting debugger agent.' |
|||
: 'Hit SIGUSR1 - starting debugger agent.'; |
|||
|
|||
var expectedLines = [ |
|||
startLog, |
|||
'debugger listening on port ' + debugPort |
|||
]; |
|||
|
|||
assert.equal(outputLines.length, expectedLines.length); |
|||
for (var i = 0; i < expectedLines.length; i++) |
|||
assert.equal(outputLines[i], expectedLines[i]); |
|||
|
|||
} |
@ -0,0 +1,86 @@ |
|||
// 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 spawn = require('child_process').spawn; |
|||
|
|||
var args = [ common.fixturesDir + '/clustered-server/app.js' ]; |
|||
var child = spawn(process.execPath, args); |
|||
var outputLines = []; |
|||
var outputTimerId; |
|||
var waitingForDebuggers = false; |
|||
|
|||
child.stderr.on('data', function(data) { |
|||
var lines = data.toString().replace(/\r/g, '').trim().split('\n'); |
|||
var line = lines[0]; |
|||
|
|||
lines.forEach(function(ln) { console.log('> ' + ln) } ); |
|||
|
|||
if (outputTimerId !== undefined) |
|||
clearTimeout(outputTimerId); |
|||
|
|||
if (waitingForDebuggers) { |
|||
outputLines = outputLines.concat(lines); |
|||
outputTimerId = setTimeout(onNoMoreLines, 200); |
|||
} else if (line === 'all workers are running') { |
|||
waitingForDebuggers = true; |
|||
process._debugProcess(child.pid); |
|||
} |
|||
}); |
|||
|
|||
function onNoMoreLines() { |
|||
assertOutputLines(); |
|||
process.exit(); |
|||
} |
|||
|
|||
setTimeout(function testTimedOut() { |
|||
assert(false, 'test timed out.'); |
|||
}, 3000); |
|||
|
|||
process.on('exit', function onExit() { |
|||
child.kill(); |
|||
}); |
|||
|
|||
function assertOutputLines() { |
|||
var startLog = process.platform === 'win32' |
|||
? 'Starting debugger agent.' |
|||
: 'Hit SIGUSR1 - starting debugger agent.'; |
|||
|
|||
var expectedLines = [ |
|||
startLog, |
|||
'debugger listening on port ' + 5858, |
|||
startLog, |
|||
'debugger listening on port ' + 5859, |
|||
startLog, |
|||
'debugger listening on port ' + 5860, |
|||
]; |
|||
|
|||
// Do not assume any particular order of output messages,
|
|||
// since workers can take different amout of time to
|
|||
// start up
|
|||
outputLines.sort(); |
|||
expectedLines.sort(); |
|||
|
|||
assert.equal(outputLines.length, expectedLines.length); |
|||
for (var i = 0; i < expectedLines.length; i++) |
|||
assert.equal(outputLines[i], expectedLines[i]); |
|||
} |
Loading…
Reference in new issue