diff options
Diffstat (limited to 'src/remake/catchup.rs')
| -rw-r--r-- | src/remake/catchup.rs | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/remake/catchup.rs b/src/remake/catchup.rs index a3443ba..68fa117 100644 --- a/src/remake/catchup.rs +++ b/src/remake/catchup.rs @@ -520,12 +520,19 @@ fn prepare( Ok(metadata) => metadata, Err(reason) => return Prepared::Failed(reason), }; + // Earlier epochs' metadata as the target's snapshot built it, whatever was written + // there since. + let built = match snapshot::as_built(copy, target) { + Ok(Some(built)) => built, + Ok(None) => return Prepared::Failed(format!("{target} follows no epoch")), + Err(reason) => return Prepared::Failed(reason), + }; // The epoch that followed ours records (per actor) which of our changes it took. // Snapshots carry earlier epochs' metadata forward while a node can replay through // it (`snapshot::left_out`), so this works across any gap within the window; beyond // it, the metadata missing quarantines as the window would. - let next = snapshot::read_epoch_metadata(copy, previous.generation + 1) + let next = snapshot::read_epoch_metadata(&built, previous.generation + 1) .ok() .filter(|next| next.previous == previous); let gap = target.generation - previous.generation; @@ -537,7 +544,7 @@ fn prepare( // this sees every one since our epoch, however far behind. let mut strict = crate::access::policy::of(old).strict(); for generation in previous.generation + 1..=target.generation { - if let Ok(epoch) = snapshot::read_epoch_metadata(copy, generation) + if let Ok(epoch) = snapshot::read_epoch_metadata(&built, generation) && epoch.kind == "strict" { if strict { @@ -552,7 +559,7 @@ fn prepare( let translator = (previous.generation + 1..=target.generation).try_fold( Translator::default(), |mut translator, generation| { - let epoch = snapshot::read_epoch_metadata(copy, generation)?; + let epoch = snapshot::read_epoch_metadata(&built, generation)?; let kind = epoch.kind().ok_or_else(|| { format!( "epoch generation {generation} was made by unknown remake kind {:?}", |