mirror of
https://github.com/denoland/deno.git
synced 2024-11-24 15:19:26 -05:00
fix(cli): Identify and fix a test deadlock (#23411)
If a worker tried to flush large amounts of data right as the test was ending, it could cause the flush sync marker to get lost.
This commit is contained in:
parent
d01e4c43c8
commit
9c0446567b
6 changed files with 51 additions and 2 deletions
1
Cargo.lock
generated
1
Cargo.lock
generated
|
@ -1118,6 +1118,7 @@ dependencies = [
|
||||||
"libz-sys",
|
"libz-sys",
|
||||||
"log",
|
"log",
|
||||||
"lsp-types",
|
"lsp-types",
|
||||||
|
"memmem",
|
||||||
"monch",
|
"monch",
|
||||||
"napi_sym",
|
"napi_sym",
|
||||||
"nix 0.26.2",
|
"nix 0.26.2",
|
||||||
|
|
|
@ -115,6 +115,7 @@ libc.workspace = true
|
||||||
libz-sys.workspace = true
|
libz-sys.workspace = true
|
||||||
log = { workspace = true, features = ["serde"] }
|
log = { workspace = true, features = ["serde"] }
|
||||||
lsp-types.workspace = true
|
lsp-types.workspace = true
|
||||||
|
memmem.workspace = true
|
||||||
monch.workspace = true
|
monch.workspace = true
|
||||||
notify.workspace = true
|
notify.workspace = true
|
||||||
once_cell.workspace = true
|
once_cell.workspace = true
|
||||||
|
|
|
@ -10,6 +10,7 @@ use deno_runtime::deno_io::pipe;
|
||||||
use deno_runtime::deno_io::AsyncPipeRead;
|
use deno_runtime::deno_io::AsyncPipeRead;
|
||||||
use deno_runtime::deno_io::PipeRead;
|
use deno_runtime::deno_io::PipeRead;
|
||||||
use deno_runtime::deno_io::PipeWrite;
|
use deno_runtime::deno_io::PipeWrite;
|
||||||
|
use memmem::Searcher;
|
||||||
use std::fmt::Display;
|
use std::fmt::Display;
|
||||||
use std::future::Future;
|
use std::future::Future;
|
||||||
use std::io::Write;
|
use std::io::Write;
|
||||||
|
@ -30,6 +31,7 @@ use tokio::sync::mpsc::WeakUnboundedSender;
|
||||||
/// 8-byte sync marker that is unlikely to appear in normal output. Equivalent
|
/// 8-byte sync marker that is unlikely to appear in normal output. Equivalent
|
||||||
/// to the string `"\u{200B}\0\u{200B}\0"`.
|
/// to the string `"\u{200B}\0\u{200B}\0"`.
|
||||||
const SYNC_MARKER: &[u8; 8] = &[226, 128, 139, 0, 226, 128, 139, 0];
|
const SYNC_MARKER: &[u8; 8] = &[226, 128, 139, 0, 226, 128, 139, 0];
|
||||||
|
const HALF_SYNC_MARKER: &[u8; 4] = &[226, 128, 139, 0];
|
||||||
|
|
||||||
const BUFFER_SIZE: usize = 4096;
|
const BUFFER_SIZE: usize = 4096;
|
||||||
|
|
||||||
|
@ -202,8 +204,30 @@ impl TestStream {
|
||||||
}
|
}
|
||||||
Ok(read) => {
|
Ok(read) => {
|
||||||
flush.extend(&buffer[0..read]);
|
flush.extend(&buffer[0..read]);
|
||||||
|
|
||||||
|
// "ends_with" is cheaper, so check that first
|
||||||
|
if flush.ends_with(HALF_SYNC_MARKER) {
|
||||||
|
// We might have read the full sync marker.
|
||||||
if flush.ends_with(SYNC_MARKER) {
|
if flush.ends_with(SYNC_MARKER) {
|
||||||
flush.truncate(flush.len() - SYNC_MARKER.len());
|
flush.truncate(flush.len() - SYNC_MARKER.len());
|
||||||
|
} else {
|
||||||
|
flush.truncate(flush.len() - HALF_SYNC_MARKER.len());
|
||||||
|
}
|
||||||
|
// Try to send our flushed buffer. If the channel is closed, this stream will
|
||||||
|
// be marked as not alive.
|
||||||
|
_ = self.send(flush);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// If we don't end with the marker, then we need to search the bytes we read plus four bytes
|
||||||
|
// from before. There's still a possibility that the marker could be split because of a pipe
|
||||||
|
// buffer that fills up, forcing the flush to be written across two writes and interleaving
|
||||||
|
// data between, but that's a risk we take with this sync marker approach.
|
||||||
|
let searcher = memmem::TwoWaySearcher::new(HALF_SYNC_MARKER);
|
||||||
|
let start =
|
||||||
|
(flush.len() - read).saturating_sub(HALF_SYNC_MARKER.len());
|
||||||
|
if let Some(offset) = searcher.search_in(&flush[start..]) {
|
||||||
|
flush.truncate(offset);
|
||||||
// Try to send our flushed buffer. If the channel is closed, this stream will
|
// Try to send our flushed buffer. If the channel is closed, this stream will
|
||||||
// be marked as not alive.
|
// be marked as not alive.
|
||||||
_ = self.send(flush);
|
_ = self.send(flush);
|
||||||
|
|
4
tests/specs/test/worker_large_output/__test__.jsonc
Normal file
4
tests/specs/test/worker_large_output/__test__.jsonc
Normal file
|
@ -0,0 +1,4 @@
|
||||||
|
{
|
||||||
|
"args": "test main.js",
|
||||||
|
"output": "main.out"
|
||||||
|
}
|
15
tests/specs/test/worker_large_output/main.js
Normal file
15
tests/specs/test/worker_large_output/main.js
Normal file
|
@ -0,0 +1,15 @@
|
||||||
|
// Regression test for workers that post large amounts of output as a test is ending. This
|
||||||
|
// test should not deadlock, though the output is undefined.
|
||||||
|
Deno.test(async function workerOutput() {
|
||||||
|
console.log("Booting worker");
|
||||||
|
const code =
|
||||||
|
"self.postMessage(0); console.log(`hello from worker\n`.repeat(60000));";
|
||||||
|
const worker = new Worker(URL.createObjectURL(new Blob([code])), {
|
||||||
|
type: "module",
|
||||||
|
});
|
||||||
|
await new Promise((r) =>
|
||||||
|
worker.addEventListener("message", () => {
|
||||||
|
r();
|
||||||
|
})
|
||||||
|
);
|
||||||
|
});
|
4
tests/specs/test/worker_large_output/main.out
Normal file
4
tests/specs/test/worker_large_output/main.out
Normal file
|
@ -0,0 +1,4 @@
|
||||||
|
[WILDCARD]
|
||||||
|
|
||||||
|
ok | 1 passed | 0 failed ([WILDCARD])
|
||||||
|
|
Loading…
Reference in a new issue