put remake content into blobs

1 files changed, 14 insertions, 1 deletions

diff --git a/src/remake/switch.rs b/src/remake/switch.rs
index e9f49ee..c18905c 100644
--- a/src/remake/switch.rs
+++ b/src/remake/switch.rs
@@ -26,6 +26,7 @@ use tracing::{error, info, warn};
 
 use super::Host;
 use super::catchup;
+use super::content;
 use super::delta::{self, ReplayStats};
 use super::kind::Translator;
 use super::local::LocalStatus;
@@ -82,6 +83,12 @@ async fn check<H: Host>(host: &H) {
     vote::cast(host).await;
 
     let all = host.read_doc(records::load_all).await;
+    content::prune(
+        host,
+        &all,
+        unix_millis(),
+        host.dormant_after().as_millis() as u64,
+    );
     let local_record = EpochRecord::from(local);
 
     let committed: Vec<(String, Record)> = all
@@ -157,10 +164,16 @@ async fn switch<H: Host>(
     id: &str,
     record: &Record,
 ) -> Result<(ReplayStats, Option<String>), String> {
-    let (Some(expected), Some(request)) = (record.committed_epoch(), record.snapshot_request(id))
+    let (Some(expected), Some(mut request)) =
+        (record.committed_epoch(), record.snapshot_request(id))
     else {
         return Err("unreadable remake record".to_owned());
     };
+    // Voters fetched it already; a node that didn't vote fetches it now. Without it the
+    // switch fails, and the node rejoins (downloading the snapshot instead).
+    if let Some(reference) = &record.proposal.content {
+        request.content = Some(content::ensure(host, reference).await?);
+    }
     let translator = request
         .translator()
         .ok_or_else(|| format!("unknown remake kind {:?}", request.kind))?;