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]>
48 lines
1.5 KiB
Rust
48 lines
1.5 KiB
Rust
#![feature(arbitrary_self_types)]
|
|
#![allow(clippy::needless_return)] // tokio macro-generated code doesn't respect this
|
|
|
|
use anyhow::Result;
|
|
use turbo_tasks::{Completion, TryJoinIterExt, Vc, run_once};
|
|
use turbo_tasks_testing::{Registration, register, run_with_tt};
|
|
|
|
static REGISTRATION: Registration = register!();
|
|
|
|
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
|
|
async fn rectangle_stress() -> Result<()> {
|
|
let size = std::env::var("TURBOPACK_TEST_RECTANGLE_STRESS_SIZE")
|
|
.map(|size| size.parse().unwrap())
|
|
.unwrap_or(50);
|
|
run_with_tt(®ISTRATION, move |tt| async move {
|
|
(0..size)
|
|
.map(|a| (a, size - 1))
|
|
.chain((0..size - 1).map(|b| (size - 1, b)))
|
|
.map(|(a, b)| {
|
|
let tt = tt.clone();
|
|
async move {
|
|
run_once(tt, async move {
|
|
rectangle(a, b).strongly_consistent().await?;
|
|
Ok(Vc::<()>::default())
|
|
})
|
|
.await
|
|
}
|
|
})
|
|
.try_join()
|
|
.await?;
|
|
Ok(())
|
|
})
|
|
.await
|
|
}
|
|
|
|
/// This fills a rectagle from (0, 0) to (a, b) by
|
|
/// first filling (0, 0) to (a - 1, b) and then (0, 0) to (a, b - 1) recursively
|
|
#[turbo_tasks::function(root)]
|
|
async fn rectangle(a: u32, b: u32) -> Result<Vc<Completion>> {
|
|
if a > 0 {
|
|
rectangle(a - 1, b).await?;
|
|
}
|
|
if b > 0 {
|
|
rectangle(a, b - 1).await?;
|
|
}
|
|
Ok(Completion::new())
|
|
}
|