Unverified Commit 0c7610b7 authored by Tobias Koppers's avatar Tobias Koppers Committed by GitHub

Turbopack: fix a bug where marking a task a completed causes a panic when…

Turbopack: fix a bug where marking a task a completed causes a panic when reading the output (#77922)

### What?

When using mark_finished() on a task, reading that task while it's still in progress will lead to a panic because it would try to schedule that task for recomputation, but it's already scheduled.
parent 5104b5eb
...@@ -455,11 +455,11 @@ impl<B: BackingStorage> TurboTasksBackendInner<B> { ...@@ -455,11 +455,11 @@ impl<B: BackingStorage> TurboTasksBackendInner<B> {
Some(Ok(Err(listen_to_done_event(this, reader, done_event)))) Some(Ok(Err(listen_to_done_event(this, reader, done_event))))
} }
Some(InProgressState::InProgress(box InProgressStateInner { Some(InProgressState::InProgress(box InProgressStateInner {
marked_as_completed, done,
done_event, done_event,
.. ..
})) => { })) => {
if !*marked_as_completed { if !*done {
Some(Ok(Err(listen_to_done_event(this, reader, done_event)))) Some(Ok(Err(listen_to_done_event(this, reader, done_event))))
} else { } else {
None None
...@@ -606,6 +606,8 @@ impl<B: BackingStorage> TurboTasksBackendInner<B> { ...@@ -606,6 +606,8 @@ impl<B: BackingStorage> TurboTasksBackendInner<B> {
// Output doesn't exist. We need to schedule the task to compute it. // Output doesn't exist. We need to schedule the task to compute it.
let (item, listener) = let (item, listener) =
CachedDataItem::new_scheduled_with_listener(self.get_task_desc_fn(task_id), note); CachedDataItem::new_scheduled_with_listener(self.get_task_desc_fn(task_id), note);
// It's not possible that the task is InProgress at this point. If it is InProgress {
// done: true } it must have Output and would early return.
task.add_new(item); task.add_new(item);
turbo_tasks.schedule(task_id); turbo_tasks.schedule(task_id);
...@@ -1135,6 +1137,7 @@ impl<B: BackingStorage> TurboTasksBackendInner<B> { ...@@ -1135,6 +1137,7 @@ impl<B: BackingStorage> TurboTasksBackendInner<B> {
done_event, done_event,
session_dependent: false, session_dependent: false,
marked_as_completed: false, marked_as_completed: false,
done: false,
new_children: Default::default(), new_children: Default::default(),
})), })),
}); });
...@@ -1277,7 +1280,7 @@ impl<B: BackingStorage> TurboTasksBackendInner<B> { ...@@ -1277,7 +1280,7 @@ impl<B: BackingStorage> TurboTasksBackendInner<B> {
}; };
let &mut InProgressState::InProgress(box InProgressStateInner { let &mut InProgressState::InProgress(box InProgressStateInner {
stale, stale,
ref mut marked_as_completed, ref mut done,
ref done_event, ref done_event,
ref mut new_children, ref mut new_children,
.. ..
...@@ -1318,10 +1321,8 @@ impl<B: BackingStorage> TurboTasksBackendInner<B> { ...@@ -1318,10 +1321,8 @@ impl<B: BackingStorage> TurboTasksBackendInner<B> {
} }
// mark the task as completed, so dependent tasks can continue working // mark the task as completed, so dependent tasks can continue working
if !*marked_as_completed { *done = true;
*marked_as_completed = true; done_event.notify(usize::MAX);
done_event.notify(usize::MAX);
}
// take the children from the task to process them // take the children from the task to process them
let mut new_children = take(new_children); let mut new_children = take(new_children);
...@@ -1502,6 +1503,7 @@ impl<B: BackingStorage> TurboTasksBackendInner<B> { ...@@ -1502,6 +1503,7 @@ impl<B: BackingStorage> TurboTasksBackendInner<B> {
once_task: _, once_task: _,
stale, stale,
session_dependent, session_dependent,
done: _,
marked_as_completed: _, marked_as_completed: _,
new_children, new_children,
}) = in_progress }) = in_progress
...@@ -1886,12 +1888,10 @@ impl<B: BackingStorage> TurboTasksBackendInner<B> { ...@@ -1886,12 +1888,10 @@ impl<B: BackingStorage> TurboTasksBackendInner<B> {
let mut task = ctx.task(task, TaskDataCategory::Data); let mut task = ctx.task(task, TaskDataCategory::Data);
if let Some(InProgressState::InProgress(box InProgressStateInner { if let Some(InProgressState::InProgress(box InProgressStateInner {
marked_as_completed, marked_as_completed,
done_event,
.. ..
})) = get_mut!(task, InProgress) })) = get_mut!(task, InProgress)
{ {
*marked_as_completed = true; *marked_as_completed = true;
done_event.notify(usize::MAX);
// TODO this should remove the dirty state (also check session_dependent) // TODO this should remove the dirty state (also check session_dependent)
// but this would break some assumptions for strongly consistent reads. // but this would break some assumptions for strongly consistent reads.
// Client tasks are not connected yet, so we wouldn't wait for them. // Client tasks are not connected yet, so we wouldn't wait for them.
......
...@@ -309,7 +309,13 @@ pub struct InProgressStateInner { ...@@ -309,7 +309,13 @@ pub struct InProgressStateInner {
#[allow(dead_code)] #[allow(dead_code)]
pub once_task: bool, pub once_task: bool,
pub session_dependent: bool, pub session_dependent: bool,
/// Early marking as completed. This is set before the output is available and will ignore full
/// task completion of the task for strongly consistent reads.
pub marked_as_completed: bool, pub marked_as_completed: bool,
/// Task execution has completed and the output is available.
pub done: bool,
/// Event that is triggered when the task output is available (completed flag set).
/// This is used to wait for completion when reading the task output before it's available.
pub done_event: Event, pub done_event: Event,
/// Children that should be connected to the task and have their active_count decremented /// Children that should be connected to the task and have their active_count decremented
/// once the task completes. /// once the task completes.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment