mirror of
https://github.com/hanzoai/next.js.git
synced 2026-10-30 14:46:38 +00:00
5d0dab5fc6
### What? Replaces the silent "make root node" promotion in the turbo-tasks backend with a panic that enforces tasks to already have the `root` attribute before performing strongly consistent reads, reading task collectibles, or removing collectibles. ### Why? Previously, the backend would silently promote any non-root task to a root node (aggregation number `u32::MAX`) when these operations were requested. This masked incorrect task configuration — tasks that needed root-level aggregation weren't explicitly declared as such, making it harder to reason about the aggregation graph and hiding potential performance issues from implicit promotions. ### How? **Backend enforcement (3 locations):** - **Strongly consistent read** (`backend/mod.rs`): Checks `NativeFunction.is_root` on the target task. If it's a persistent task without `root`, panics with both the target and reader task descriptions. - **Read task collectibles** (`backend/mod.rs`): Same check when reading collectibles from a task. - **Remove collectibles** (`operation/update_collectible.rs`): Same check when removing collectibles (count < 0). All three locations drop the task guard before panicking to avoid deadlocking with `debug_get_task_description`. **Macro support for `root` on methods:** - `value_impl_macro.rs`: Now reads the `root` attribute from `#[turbo_tasks::function(root)]` on inherent impl and trait impl methods (previously hardcoded to `false`). - `value_trait_macro.rs`: Same for trait default methods. **`root` attribute additions:** - All `#[turbo_tasks::function(operation)]` in test files, benchmarks, and fuzz code - Production operations in `crates/next-api/` that are read with strong consistency - Regular functions and methods in tests that use `.strongly_consistent()` - Trait methods in `value_impl` and `value_trait` blocks used with strong consistency **New test:** - `non_root_task_panic.rs`: Verifies the panic fires when attempting a strongly consistent read on a non-root operation task. Captures the panic from the worker thread via a panic hook since the panic propagates as a channel error to the test thread. <!-- NEXT_JS_LLM_PR --> --------- Co-authored-by: Claude Opus 4.7 (1M context) <[email protected]>
67 lines
1.9 KiB
Rust
67 lines
1.9 KiB
Rust
#![feature(arbitrary_self_types)]
|
|
#![feature(arbitrary_self_types_pointers)]
|
|
#![allow(clippy::needless_return)] // tokio macro-generated code doesn't respect this
|
|
|
|
use turbo_rcstr::RcStr;
|
|
use turbo_tasks::{ResolvedVc, ValueToString, Vc, turbobail, turbofmt};
|
|
use turbo_tasks_testing::{Registration, register, run_once};
|
|
|
|
static REGISTRATION: Registration = register!();
|
|
|
|
#[turbo_tasks::value(shared)]
|
|
#[derive(ValueToString)]
|
|
#[value_to_string("item {name} (count: {count})")]
|
|
struct FmtTest {
|
|
name: RcStr,
|
|
count: u32,
|
|
}
|
|
|
|
#[turbo_tasks::function(operation, root)]
|
|
async fn turbofmt_operation(value: ResolvedVc<FmtTest>) -> anyhow::Result<Vc<RcStr>> {
|
|
let s: RcStr = turbofmt!("prefix {} vc {}", 42u32, value).await?;
|
|
Ok(Vc::cell(s))
|
|
}
|
|
|
|
#[turbo_tasks::function(operation, root)]
|
|
async fn turbobail_operation(value: ResolvedVc<FmtTest>) -> anyhow::Result<Vc<RcStr>> {
|
|
turbobail!("error: {} with {}", 42u32, value)
|
|
}
|
|
|
|
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
|
|
async fn test_turbofmt() {
|
|
run_once(®ISTRATION, || async {
|
|
let v = FmtTest {
|
|
name: "foo".into(),
|
|
count: 7,
|
|
}
|
|
.resolved_cell();
|
|
assert_eq!(
|
|
&*turbofmt_operation(v).read_strongly_consistent().await?,
|
|
"prefix 42 vc item foo (count: 7)"
|
|
);
|
|
anyhow::Ok(())
|
|
})
|
|
.await
|
|
.unwrap()
|
|
}
|
|
|
|
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
|
|
async fn test_turbobail() {
|
|
run_once(®ISTRATION, || async {
|
|
let v = FmtTest {
|
|
name: "bar".into(),
|
|
count: 3,
|
|
}
|
|
.resolved_cell();
|
|
|
|
let result = turbobail_operation(v).read_strongly_consistent().await;
|
|
|
|
let err = result.unwrap_err();
|
|
let root = err.root_cause().to_string();
|
|
assert_eq!(root, "error: 42 with item bar (count: 3)");
|
|
anyhow::Ok(())
|
|
})
|
|
.await
|
|
.unwrap()
|
|
}
|