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]>
85 lines
2.4 KiB
Rust
85 lines
2.4 KiB
Rust
#![feature(arbitrary_self_types)]
|
|
#![feature(arbitrary_self_types_pointers)]
|
|
#![allow(clippy::needless_return)] // tokio macro-generated code doesn't respect this
|
|
|
|
use anyhow::{Result, bail};
|
|
use rand::{RngExt, SeedableRng, rngs::StdRng};
|
|
use turbo_tasks::{ResolvedVc, State, Vc};
|
|
use turbo_tasks_testing::{Registration, register, run_once};
|
|
|
|
static REGISTRATION: Registration = register!();
|
|
|
|
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
|
|
async fn test_random_change() {
|
|
run_once(®ISTRATION, || async {
|
|
let state_op = make_state_operation();
|
|
let state_vc = state_op.resolve().strongly_consistent().await?;
|
|
let state = state_op.read_strongly_consistent().await?;
|
|
|
|
let mut rng = StdRng::from_seed(Default::default());
|
|
let func_op = func_operation(state_vc);
|
|
let func2_op = func2_operation(state_vc);
|
|
for _i in 0..10 {
|
|
let value = rng.random_range(0..100);
|
|
state.state.set(value);
|
|
|
|
let result = func_op.read_strongly_consistent().await?;
|
|
assert_eq!(result.value, value);
|
|
|
|
let result = func2_op.read_strongly_consistent().await?;
|
|
assert_eq!(result.value, value);
|
|
}
|
|
|
|
anyhow::Ok(())
|
|
})
|
|
.await
|
|
.unwrap()
|
|
}
|
|
|
|
#[turbo_tasks::value]
|
|
#[derive(Clone, Debug)]
|
|
struct Value {
|
|
value: i32,
|
|
}
|
|
|
|
#[turbo_tasks::value]
|
|
#[derive(Debug)]
|
|
struct ValueContainer {
|
|
state: State<i32>,
|
|
}
|
|
|
|
#[turbo_tasks::function(operation, root)]
|
|
fn make_state_operation() -> Vc<ValueContainer> {
|
|
ValueContainer {
|
|
state: State::new(0),
|
|
}
|
|
.cell()
|
|
}
|
|
|
|
#[turbo_tasks::function(operation, root)]
|
|
async fn func2_operation(input: ResolvedVc<ValueContainer>) -> Result<Vc<Value>> {
|
|
let state = input.await?;
|
|
let value = state.state.get();
|
|
println!("func2 {}", *value);
|
|
Ok(func(*input, -*value))
|
|
}
|
|
|
|
#[turbo_tasks::function(operation, root)]
|
|
async fn func_operation(input: ResolvedVc<ValueContainer>) -> Vc<Value> {
|
|
func(*input, 0)
|
|
}
|
|
|
|
#[turbo_tasks::function]
|
|
async fn func(input: Vc<ValueContainer>, nesting: i32) -> Result<Vc<Value>> {
|
|
let state = input.await?;
|
|
let value = state.state.get();
|
|
if nesting < *value {
|
|
return Ok(func(input, nesting + 1));
|
|
}
|
|
if nesting == *value {
|
|
println!("func {nesting}");
|
|
return Ok(Value { value: *value }.cell());
|
|
}
|
|
bail!("func no longer valid {}", nesting)
|
|
}
|