Skip to content

lib: fix cluster handle leak #3510

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Trott wants to merge 2 commits into from
+57 −1
Closed

lib: fix cluster handle leak #3510

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5d5b5fc
lib: fix cluster handle leak
Trott Oct 24, 2015
9c0b131
fixup: swallow ECONNRESET
Trott Oct 26, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
lib: fix cluster handle leak 
It is possible to cause a resource leak in SharedHandle. This commit
fixes the leak.

Fixes: #2510
PR-URL: #3510
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
  • Loading branch information
@Trott
Trott committed Oct 26, 2015
commit 5d5b5fc31121500d8c787016e15da85f9a76cb5e
5 changes: 4 additions & 1 deletion lib/cluster.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,10 @@ function masterInit() {
* if it has disconnected, otherwise we might
* still want to access it.
*/
if (!worker.isConnected()) removeWorker(worker);
if (!worker.isConnected()) {
removeHandlesForWorker(worker);
removeWorker(worker);
}

worker.suicide = !!worker.suicide;
worker.state = 'dead';
Expand Down
53 changes: 53 additions & 0 deletions test/parallel/test-cluster-shared-leak.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
// In Node 4.2.1 on operating systems other than Linux, this test triggers an
// assertion in cluster.js. The assertion protects against memory leaks.
// https://github.com/nodejs/node/pull/3510

'use strict';
const common = require('../common');
const assert = require('assert');
const net = require('net');
const cluster = require('cluster');
cluster.schedulingPolicy = cluster.SCHED_NONE;

if (cluster.isMaster) {
var conn, worker1, worker2;

worker1 = cluster.fork();
worker1.on('message', common.mustCall(function() {
worker2 = cluster.fork();
conn = net.connect(common.PORT, common.mustCall(function() {
worker1.send('die');
worker2.send('die');
}));
// c.on('error', function(e) {
// // ECONNRESET is OK
// if (e.code !== 'ECONNRESET')
// throw e;
// });
}));

cluster.on('exit', function(worker, exitCode, signalCode) {
assert(worker === worker1 || worker === worker2);
assert.strictEqual(exitCode, 0);
assert.strictEqual(signalCode, null);
if (Object.keys(cluster.workers).length === 0)
conn.destroy();
});

return;
}

var server = net.createServer(function(c) {
c.end('bye');
});

server.listen(common.PORT, function() {
process.send('listening');
});

process.on('message', function(msg) {
if (msg !== 'die') return;
server.close(function() {
setImmediate(() => process.disconnect());
});
});