hanzoai/next.js
2
0
Fork 0
mirror of https://github.com/hanzoai/next.js.git synced 2026-09-24 17:00:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix DashMap read-write self-deadlock in task_cache causing hangs (#92210)

Browse Source
This commit is contained in:
Tobias Koppers
2026-04-01 13:25:03 -07:00
committed by GitHub
parent 3e0158846e
commit 9e1509307e
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
turbopack/crates/turbo-tasks-backend/src/backend/mod.rs
+7 -5
View File
@@ -1532,8 +1532,9 @@ impl<B: BackingStorage> TurboTasksBackendInner<B> {
// Create a single ExecuteContext for both lookup and connect_child
let mut ctx = self.execute_context(turbo_tasks);
// First check if the task exists in the cache which only uses a read lock
if let Some(task_id) = self.task_cache.get(&task_type) {
let task_id = *task_id;
// .map(|r| *r) copies the TaskId and drops the DashMap Ref (releasing the read lock)
// before ConnectChildOperation::run, which may re-enter task_cache with a write lock.
if let Some(task_id) = self.task_cache.get(&task_type).map(|r| *r) {
self.track_cache_hit(&task_type);
operation::ConnectChildOperation::run(
parent_task,
@@ -1614,9 +1615,10 @@ impl<B: BackingStorage> TurboTasksBackendInner<B> {
);
}
let mut ctx = self.execute_context(turbo_tasks);
// First check if the task exists in the cache which only uses a read lock
if let Some(task_id) = self.task_cache.get(&task_type) {
let task_id = *task_id;
// First check if the task exists in the cache which only uses a read lock.
// .map(|r| *r) copies the TaskId and drops the DashMap Ref (releasing the read lock)
// before ConnectChildOperation::run, which may re-enter task_cache with a write lock.
if let Some(task_id) = self.task_cache.get(&task_type).map(|r| *r) {
self.track_cache_hit(&task_type);
operation::ConnectChildOperation::run(
parent_task,