Skip to content

fix: Properly set MerkleChangeSets checkpoint in stage's fast-path #19421

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
mediocregopher merged 1 commit into from
Oct 31, 2025
Merged

fix: Properly set MerkleChangeSets checkpoint in stage's fast-path #19421

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
10 changes: 8 additions & 2 deletions crates/stages/stages/src/stages/merkle_changesets.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,6 +312,12 @@ where
// Get the previously computed range. This will be updated to reflect the populating of the
// target range.
let mut computed_range = Self::computed_range(provider, input.checkpoint)?;
debug!(
target: "sync::stages::merkle_changesets",
?computed_range,
?target_range,
"Got computed and target ranges",
);

// We want the target range to not include any data already computed previously, if
// possible, so we start the target range from the end of the computed range if that is
Expand All @@ -335,9 +341,9 @@ where
}

// If target range is empty (target_start >= target_end), stage is already successfully
// executed
// executed.
if target_range.start >= target_range.end {
return Ok(ExecOutput::done(input.checkpoint.unwrap_or_default()));
return Ok(ExecOutput::done(StageCheckpoint::new(target_range.end.saturating_sub(1))));
}

// If our target range is a continuation of the already computed range then we can keep the
Expand Down