Skip to content

Turbopack: avoid storing task data and task cache concurrenctly #78775

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 6, 2025
Merged

Turbopack: avoid storing task data and task cache concurrenctly #78775

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
142 changes: 67 additions & 75 deletions turbopack/crates/turbo-tasks-backend/src/kv_backing_storage.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,92 +177,84 @@ impl<T: KeyValueDatabase + Send + Sync + 'static> BackingStorage
{
let _span = tracing::trace_span!("save snapshot", session_id = ?session_id, operations = operations.len());
let mut batch = self.database.write_batch()?;
let mut task_items_result = Ok(Vec::new());

// Start organizing the updates in parallel
match &mut batch {
WriteBatch::Concurrent(ref batch, _) => {
turbo_tasks::scope(|s| {
s.spawn(|_| {
let _span = tracing::trace_span!("update task meta").entered();
task_items_result = process_task_data(snapshots, Some(batch));
});
{
let _span = tracing::trace_span!("update task data").entered();
process_task_data(snapshots, Some(batch))?;
}

let mut next_task_id =
get_next_free_task_id::<
T::SerialWriteBatch<'_>,
T::ConcurrentWriteBatch<'_>,
>(&mut WriteBatchRef::concurrent(batch))?;
let mut next_task_id = get_next_free_task_id::<
T::SerialWriteBatch<'_>,
T::ConcurrentWriteBatch<'_>,
>(&mut WriteBatchRef::concurrent(batch))?;

{
let _span = tracing::trace_span!(
"update task cache",
items = task_cache_updates.iter().map(|m| m.len()).sum::<usize>()
)
.entered();
let result = task_cache_updates
.into_par_iter()
.with_max_len(1)
.map(|updates| {
let mut max_task_id = 0;

let mut task_type_bytes = Vec::new();
for (task_type, task_id) in updates {
let task_id: u32 = *task_id;
serialize_task_type(&task_type, &mut task_type_bytes, task_id)?;

batch
.put(
KeySpace::ForwardTaskCache,
WriteBuffer::Borrowed(&task_type_bytes),
WriteBuffer::Borrowed(&task_id.to_le_bytes()),
{
let _span = tracing::trace_span!(
"update task cache",
items = task_cache_updates.iter().map(|m| m.len()).sum::<usize>()
)
.entered();
let result = task_cache_updates
.into_par_iter()
.with_max_len(1)
.map(|updates| {
let mut max_task_id = 0;

let mut task_type_bytes = Vec::new();
for (task_type, task_id) in updates {
let task_id: u32 = *task_id;
serialize_task_type(&task_type, &mut task_type_bytes, task_id)?;

batch
.put(
KeySpace::ForwardTaskCache,
WriteBuffer::Borrowed(&task_type_bytes),
WriteBuffer::Borrowed(&task_id.to_le_bytes()),
)
.with_context(|| {
anyhow!(
"Unable to write task cache {task_type:?} => {task_id}"
)
.with_context(|| {
anyhow!(
"Unable to write task cache {task_type:?} => \
{task_id}"
)
})?;
batch
.put(
KeySpace::ReverseTaskCache,
WriteBuffer::Borrowed(IntKey::new(task_id).as_ref()),
WriteBuffer::Borrowed(&task_type_bytes),
})?;
batch
.put(
KeySpace::ReverseTaskCache,
WriteBuffer::Borrowed(IntKey::new(task_id).as_ref()),
WriteBuffer::Borrowed(&task_type_bytes),
)
.with_context(|| {
anyhow!(
"Unable to write task cache {task_id} => {task_type:?}"
)
.with_context(|| {
anyhow!(
"Unable to write task cache {task_id} => \
{task_type:?}"
)
})?;
max_task_id = max_task_id.max(task_id + 1);
}

Ok(max_task_id)
})
.reduce(
|| Ok(0),
|a, b| -> anyhow::Result<_> {
let a_max = a?;
let b_max = b?;
Ok(max(a_max, b_max))
},
)?;
next_task_id = next_task_id.max(result);
}

save_infra::<T::SerialWriteBatch<'_>, T::ConcurrentWriteBatch<'_>>(
&mut WriteBatchRef::concurrent(batch),
next_task_id,
session_id,
operations,
)?;
anyhow::Ok(())
})?;
})?;
max_task_id = max_task_id.max(task_id + 1);
}

Ok(max_task_id)
})
.reduce(
|| Ok(0),
|a, b| -> anyhow::Result<_> {
let a_max = a?;
let b_max = b?;
Ok(max(a_max, b_max))
},
)?;
next_task_id = next_task_id.max(result);
}

task_items_result?;
save_infra::<T::SerialWriteBatch<'_>, T::ConcurrentWriteBatch<'_>>(
&mut WriteBatchRef::concurrent(batch),
next_task_id,
session_id,
operations,
)?;
}
WriteBatch::Serial(batch) => {
let mut task_items_result = Ok(Vec::new());
turbo_tasks::scope(|s| {
s.spawn(|_| {
task_items_result =
Expand Down
Loading