Skip to content
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.

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

worker: fix stream & termination race bug #42874

Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
3 changes: 2 additions & 1 deletion src/stream_base.cc
Original file line number Diff line number Diff line change
Expand Up @@ -619,7 +619,8 @@ void ReportWritesToJSStreamListener::OnStreamAfterReqFinished(
stream->ClearError();
}

if (req_wrap_obj->Has(env->context(), env->oncomplete_string()).FromJust())
if (req_wrap_obj->Has(env->context(), env->oncomplete_string())
.FromMaybe(false))
RaisinTen marked this conversation as resolved.
Show resolved Hide resolved
async_wrap->MakeCallback(env->oncomplete_string(), arraysize(argv), argv);
}

Expand Down
55 changes: 55 additions & 0 deletions test/parallel/test-worker-http2-stream-terminate.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
'use strict';
airtable-keyhanvakil marked this conversation as resolved.
Show resolved Hide resolved
const common = require('../common');
if (!common.hasCrypto)
common.skip('missing crypto');
const http2 = require('http2');
const makeDuplexPair = require('../common/duplexpair');
const { Worker, isMainThread, parentPort } = require('worker_threads');

// This test ensures that workers can be terminated without error while
// stream activity is ongoing, in particular the C++ function
// ReportWritesToJSStreamListener::OnStreamAfterReqFinished.

if (isMainThread) {
const sab = new SharedArrayBuffer(4);
const terminate = new Int32Array(sab);

const w = new Worker(__filename);
w.postMessage(sab);
process.nextTick(() => {
Atomics.wait(terminate, 0, 0);
setImmediate(() => w.terminate());
});
return;
}

parentPort.on('message', (sab) => {
const terminate = new Int32Array(sab);
const server = http2.createServer();
let i = 0;
server.on('stream', (stream, headers) => {
if (i === 1) {
Atomics.store(terminate, 0, 1);
Atomics.notify(terminate, 0, 1);
}
i++;

stream.end('');
});

const { clientSide, serverSide } = makeDuplexPair();
server.emit('connection', serverSide);

const client = http2.connect('http://localhost:80', {
createConnection: () => clientSide,
});

function makeReq() {
for (let i = 0; i < 3; i++) {
client.request().end();
}
setImmediate(makeReq);
}
makeReq();

});