sources: drop a repo's cursor before its first delete, so a failed run is re-ingested whole

A failed run from A to B followed by a head C that reverts the files to A's
content diffed A..C as empty and kept the deleted chunks deleted (Soul
cursor-revert-hole: 32 of 40 chunks, cursor at C). With the cursor gone the
next run takes the whole-repo path whatever head it finds.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
This commit is contained in:
Meta Vens 2026-10-31 08:56:21 +01:00
commit 3f380df0fe
2 changed files with 51 additions and 2 deletions

View file

@ -13,6 +13,8 @@
//! lives in the collection's own metadata, so it is lost with the collection
//! and the two cannot disagree about what is held. It is advanced only after
//! the repo's deletes and upserts are acknowledged: it may lag and never leads.
//! It is dropped before the repo's first delete, so a run that fails between
//! the delete and the upserts leaves no cursor, and the repo is ingested whole.
//! The cursors object is written whole by this job alone, once per repo.
pub mod chunk;
@ -295,6 +297,14 @@ fn refresh_repo<E: Embedder, S: SourceIndex, F: Forge>(
Some(old) if mirror.is_ancestor(old, &head) => Some(mirror.changed_paths(old, &head)?.into_iter().collect()),
_ => None,
};
// From the first delete on, the collection holds no single commit's chunks
// for this repo until the run finishes. Say so before changing anything:
// the cursor is dropped, so a run that dies half way leaves a repo the next
// run re-ingests whole, whatever head it finds then. A cursor left at the
// old commit would let a later head that reverts the files hide the hole.
if cursors.remove(&repo.name).is_some() {
index.set_cursors(cursors).context("dropping the cursor before the repo's chunks change")?;
}
match &changed {
Some(paths) => {
let paths: Vec<String> = paths.iter().cloned().collect();

View file

@ -182,7 +182,7 @@ fn unchanged_repo_makes_no_embed_call() {
assert_eq!((reports[0].files, reports[0].chunks), (0, 0));
}
/// An upsert that fails mid-repo leaves the cursor on the old commit, and the
/// An upsert that fails mid-repo leaves no cursor (no commit is held whole), and the
/// next run converges to the points a clean run of the same history makes.
#[test]
fn cursor_never_leads() {
@ -203,7 +203,8 @@ fn cursor_never_leads() {
}
let (refreshed, _) = rig.run(&mut forge);
assert_eq!(refreshed.unwrap().failed, ["Demo"], "one repo failed, the run finished");
assert_eq!(rig.index.cursors().get("Demo"), Some(&a), "the cursor never leads the points");
assert_eq!(rig.index.cursors().get("Demo"), None, "no commit's chunks are held whole, so no cursor says one is");
assert_ne!(a, b);
rig.index.state.lock().unwrap().fail_upserts_after = None;
rig.converged(&mut forge);
@ -214,6 +215,44 @@ fn cursor_never_leads() {
assert_eq!(rig.index.ids(), clean.index.ids());
}
/// A run that fails between a repo's deletes and its upserts leaves chunks of
/// no single commit. A head that then reverts the files to the old content
/// makes an empty diff from the old commit, which would keep the deleted
/// chunks deleted; the repo is ingested whole instead.
#[test]
fn a_failed_run_then_a_revert_converges() {
let remote = Remote::new();
let at_a: Vec<(String, Vec<u8>)> = (0..40).map(|n| (format!("f{n}.rs"), format!("file {n}
").into_bytes())).collect();
let original: Vec<(&str, &[u8])> = at_a.iter().map(|(path, bytes)| (path.as_str(), bytes.as_slice())).collect();
remote.commit(&original, &[]);
let mut rig = Rig::new();
let mut forge = FakeForge::of(&[("Demo", &remote)]);
rig.converged(&mut forge);
let at_b: Vec<(String, Vec<u8>)> = (0..40).map(|n| (format!("f{n}.rs"), format!("file {n} edited
").into_bytes())).collect();
let edited: Vec<(&str, &[u8])> = at_b.iter().map(|(path, bytes)| (path.as_str(), bytes.as_slice())).collect();
remote.commit(&edited, &[]);
{
let mut state = rig.index.state.lock().unwrap();
state.fail_upserts_after = Some(state.upsert_calls + 1);
}
let (refreshed, _) = rig.run(&mut forge);
assert_eq!(refreshed.unwrap().failed, ["Demo"]);
assert!(rig.index.held().len() < 40, "the failed run left a partial repo");
rig.index.state.lock().unwrap().fail_upserts_after = None;
let c = remote.commit(&original, &[]);
rig.converged(&mut forge);
assert_eq!(rig.index.cursors().get("Demo"), Some(&c));
let mut clean = Rig::new();
clean.converged(&mut forge);
assert_eq!(rig.index.held().len(), 40, "every file of the reverted head is held");
assert_eq!(rig.index.held(), clean.index.held());
assert_eq!(rig.index.ids(), clean.index.ids());
}
/// One repo failing is logged and the others go on.
#[test]
fn one_repos_failure_does_not_stop_the_others() {