mirror of
https://github.com/nodejs/node.git
synced 2025-12-28 07:50:41 +00:00
cluster: fix error on worker disconnect/destroy
Avoid sending multiple `exitedAfterDisconnect` messages when concurrently calling `disconnect()` and/or `destroy()` from the worker so `ERR_IPC_DISCONNECTED` errors are not generated. Fixes: https://github.com/nodejs/node/issues/32106 PR-URL: https://github.com/nodejs/node/pull/32793 Reviewed-By: Zeyu Yang <himself65@outlook.com> Reviewed-By: Anna Henningsen <anna@addaleax.net>
This commit is contained in:
parent
ee9280a02a
commit
73324cf76a
@ -228,16 +228,23 @@ function _disconnect(masterInitiated) {
|
||||
|
||||
// Extend generic Worker with methods specific to worker processes.
|
||||
Worker.prototype.disconnect = function() {
|
||||
_disconnect.call(this);
|
||||
if (![ 'disconnecting', 'destroying' ].includes(this.state)) {
|
||||
this.state = 'disconnecting';
|
||||
_disconnect.call(this);
|
||||
}
|
||||
|
||||
return this;
|
||||
};
|
||||
|
||||
Worker.prototype.destroy = function() {
|
||||
this.exitedAfterDisconnect = true;
|
||||
if (this.state === 'destroying')
|
||||
return;
|
||||
|
||||
this.exitedAfterDisconnect = true;
|
||||
if (!this.isConnected()) {
|
||||
process.exit(0);
|
||||
} else {
|
||||
this.state = 'destroying';
|
||||
send({ act: 'exitedAfterDisconnect' }, () => process.disconnect());
|
||||
process.once('disconnect', () => process.exit(0));
|
||||
}
|
||||
|
||||
48
test/parallel/test-cluster-concurrent-disconnect.js
Normal file
48
test/parallel/test-cluster-concurrent-disconnect.js
Normal file
@ -0,0 +1,48 @@
|
||||
'use strict';
|
||||
|
||||
// Ref: https://github.com/nodejs/node/issues/32106
|
||||
|
||||
const common = require('../common');
|
||||
|
||||
const assert = require('assert');
|
||||
const cluster = require('cluster');
|
||||
const os = require('os');
|
||||
|
||||
if (cluster.isMaster) {
|
||||
const workers = [];
|
||||
const numCPUs = os.cpus().length;
|
||||
let waitOnline = numCPUs;
|
||||
for (let i = 0; i < numCPUs; i++) {
|
||||
const worker = cluster.fork();
|
||||
workers[i] = worker;
|
||||
worker.once('online', common.mustCall(() => {
|
||||
if (--waitOnline === 0)
|
||||
for (const worker of workers)
|
||||
if (worker.isConnected())
|
||||
worker.send(i % 2 ? 'disconnect' : 'destroy');
|
||||
}));
|
||||
|
||||
// These errors can occur due to the nature of the test, we might be trying
|
||||
// to send messages when the worker is disconnecting.
|
||||
worker.on('error', (err) => {
|
||||
assert.strictEqual(err.syscall, 'write');
|
||||
assert.strictEqual(err.code, 'EPIPE');
|
||||
});
|
||||
|
||||
worker.once('disconnect', common.mustCall(() => {
|
||||
for (const worker of workers)
|
||||
if (worker.isConnected())
|
||||
worker.send('disconnect');
|
||||
}));
|
||||
|
||||
worker.once('exit', common.mustCall((code, signal) => {
|
||||
assert.strictEqual(code, 0);
|
||||
assert.strictEqual(signal, null);
|
||||
}));
|
||||
}
|
||||
} else {
|
||||
process.on('message', (msg) => {
|
||||
if (cluster.worker.isConnected())
|
||||
cluster.worker[msg]();
|
||||
});
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user