Skip to content

persist: Poke at a fetch-time assert #35132

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
bkirwi merged 2 commits into from
Feb 24, 2026
Merged

persist: Poke at a fetch-time assert #35132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5003bc9
Weaken a batch-time assert
bkirwi Feb 17, 2026
0938227
Add an additional since check to the run-replacement path
bkirwi Feb 17, 2026
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
2 changes: 1 addition & 1 deletion src/persist-client/src/fetch.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1295,7 +1295,7 @@ where
registered_desc
);
} else {
assert!(
soft_assert_or_log!(
PartialOrder::less_equal(inline_desc.since(), registered_desc.since()),
"key={} inline={:?} registered={:?}",
printable_name,
Expand Down
10 changes: 9 additions & 1 deletion src/persist-client/src/internal/trace.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ use serde::{Serialize, Serializer};
use timely::PartialOrder;
use timely::progress::frontier::AntichainRef;
use timely::progress::{Antichain, Timestamp};
use tracing::warn;
use tracing::{error, warn};

use crate::internal::paths::WriterKey;
use crate::internal::state::{HollowBatch, RunId};
Expand Down Expand Up @@ -1210,6 +1210,14 @@ impl<T: Timestamp + Lattice + Codec64> SpineBatch<T> {
replacement_desc.upper(),
existing_desc.upper()
);
if !PartialOrder::less_equal(existing_desc.since(), replacement_desc.since()) {
error!(
"batch since should advance, but {:?} !<= {:?}",
existing_desc.since(),
replacement_desc.since()
);
return ApplyMergeResult::NotAppliedInvalidSince;
}

let batch = &batch.batch;
let run_ids = runs.iter().cloned().collect::<Vec<_>>();
Expand Down