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]>
130 lines
3.6 KiB
Rust
130 lines
3.6 KiB
Rust
#![feature(arbitrary_self_types)]
|
|
#![feature(arbitrary_self_types_pointers)]
|
|
#![allow(clippy::needless_return)] // clippy bug causes false positive
|
|
|
|
use anyhow::{Result, bail};
|
|
use turbo_rcstr::RcStr;
|
|
use turbo_tasks::{
|
|
CollectiblesSource, ResolvedVc, State, ValueToString, Vc, emit,
|
|
unmark_top_level_task_may_leak_eventually_consistent_state,
|
|
};
|
|
use turbo_tasks_testing::{Registration, register, run_once};
|
|
|
|
static REGISTRATION: Registration = register!();
|
|
|
|
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
|
|
async fn recompute() {
|
|
run_once(®ISTRATION, || async {
|
|
unmark_top_level_task_may_leak_eventually_consistent_state();
|
|
let input = *ChangingInput::new(1).to_resolved().await?;
|
|
let input2 = *ChangingInput::new(2).to_resolved().await?;
|
|
input.await?.state.set(1);
|
|
input2.await?.state.set(1000);
|
|
let output = compute(input, input2, 1);
|
|
let read = output.strongly_consistent().await?;
|
|
assert_eq!(read.value, 42);
|
|
assert_eq!(read.collectible, "1");
|
|
|
|
for i in 2..100 {
|
|
input.await?.state.set(i);
|
|
let read = output.strongly_consistent().await?;
|
|
assert_eq!(read.value, 42);
|
|
assert_eq!(read.collectible, i.to_string());
|
|
}
|
|
|
|
for i in 0..100 {
|
|
input2.await?.state.set(i);
|
|
let read = output.strongly_consistent().await?;
|
|
assert_eq!(read.value, 42);
|
|
assert_eq!(read.collectible, "99");
|
|
}
|
|
anyhow::Ok(())
|
|
})
|
|
.await
|
|
.unwrap()
|
|
}
|
|
|
|
#[turbo_tasks::value]
|
|
struct ChangingInput {
|
|
state: State<u32>,
|
|
}
|
|
|
|
#[turbo_tasks::value_impl]
|
|
impl ChangingInput {
|
|
#[turbo_tasks::function]
|
|
fn new(key: u32) -> Vc<Self> {
|
|
let _ = key;
|
|
Self {
|
|
state: State::new(1),
|
|
}
|
|
.cell()
|
|
}
|
|
}
|
|
|
|
#[turbo_tasks::value]
|
|
struct Output {
|
|
value: u32,
|
|
collectible: String,
|
|
}
|
|
|
|
#[turbo_tasks::value]
|
|
struct Collectible {
|
|
value: u32,
|
|
}
|
|
|
|
#[turbo_tasks::value_impl]
|
|
impl ValueToString for Collectible {
|
|
#[turbo_tasks::function]
|
|
fn to_string(&self) -> Vc<RcStr> {
|
|
Vc::cell(self.value.to_string().into())
|
|
}
|
|
}
|
|
|
|
#[turbo_tasks::function(operation, root)]
|
|
async fn inner_compute(
|
|
input: ResolvedVc<ChangingInput>,
|
|
input2: ResolvedVc<ChangingInput>,
|
|
) -> Result<Vc<u32>> {
|
|
println!("inner_compute()");
|
|
Ok(inner_compute2(*input, *input2.await?.state.get()))
|
|
}
|
|
|
|
#[turbo_tasks::function]
|
|
async fn inner_compute2(input: Vc<ChangingInput>, innerness: u32) -> Result<Vc<u32>> {
|
|
println!("inner_compute2({innerness})");
|
|
if innerness > 0 {
|
|
return Ok(inner_compute2(input, innerness - 1));
|
|
}
|
|
let value = *input.await?.state.get();
|
|
let collectible: ResolvedVc<Box<dyn ValueToString>> =
|
|
ResolvedVc::upcast(Collectible { value }.resolved_cell());
|
|
emit(collectible);
|
|
|
|
Ok(Vc::cell(42))
|
|
}
|
|
|
|
#[turbo_tasks::function(root)]
|
|
async fn compute(
|
|
input: ResolvedVc<ChangingInput>,
|
|
input2: ResolvedVc<ChangingInput>,
|
|
innerness: u32,
|
|
) -> Result<Vc<Output>> {
|
|
println!("compute({innerness})");
|
|
if innerness > 0 {
|
|
return Ok(compute(*input, *input2, innerness - 1));
|
|
}
|
|
let operation = inner_compute(input, input2);
|
|
let value = *operation.connect().await?;
|
|
let collectibles = operation.peek_collectibles::<Box<dyn ValueToString>>();
|
|
if collectibles.len() != 1 {
|
|
bail!("expected 1 collectible, found {}", collectibles.len());
|
|
}
|
|
let first = *collectibles.iter().next().unwrap();
|
|
let collectible = first.to_string().await?;
|
|
Ok(Output {
|
|
value,
|
|
collectible: collectible.to_string(),
|
|
}
|
|
.cell())
|
|
}
|