1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

test: fix cluster-worker-wait-server-close races

Browse Source 
Wait for data to arrive from worker before doing a disconnect. Without
this, whether the disconnect arrives at the worker before the master
accepts and forwards the connection descriptor to the worker is a race.

Reviewed-By: Sam Roberts <vieuxtech@gmail.com>
Reviewed-By: Johan Bergström <bugs@bergstroem.nu>
Reviewed-By: Rod Vagg <rod@vagg.org>
PR-URL: https://github.com/nodejs/io.js/pull/1953
Fixes: https://github.com/nodejs/io.js/issues/1933
Fixes: https://github.com/nodejs/io.js/pull/1400
This commit is contained in:
Sam Roberts 2015-06-11 14:43:09 -07:00
parent 2a7fd0ad32
commit 03ce84dfa1
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
test/parallel/test-cluster-worker-wait-server-close.js
View File

@ -8,7 +8,9 @@ var net = require('net');
if (cluster.isWorker) {
net.createServer(function(socket) {
// Wait for any data, then close connection
socket.on('data', socket.end.bind(socket));
socket.write('.');
socket.on('data', function discard() {
});
}).listen(common.PORT, common.localhostIPv4);
} else if (cluster.isMaster) {
@ -22,11 +24,15 @@ if (cluster.isWorker) {
worker.once('listening', function() {
net.createConnection(common.PORT, common.localhostIPv4, function() {
var socket = this;
worker.disconnect();
setTimeout(function() {
socket.write('.');
connectionDone = true;
}, 1000);
this.on('data', function() {
console.log('got data from client');
// socket definitely connected to worker if we got data
worker.disconnect();
setTimeout(function() {
socket.end();
connectionDone = true;
}, 1000);
});
});
});