From c8d04d733b8d01e23ccd959ea4a839d22b70229b Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 20 Oct 2026 02:25:54 +0200
Subject: fix catch-up / compaction in general

---
 src/compaction/mod.rs    |  2 --
 src/compaction/switch.rs | 11 +++++++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

(limited to 'src/compaction')

diff --git a/src/compaction/mod.rs b/src/compaction/mod.rs
index 70226a9..c017610 100644
--- a/src/compaction/mod.rs
+++ b/src/compaction/mod.rs
@@ -105,8 +105,6 @@ pub(crate) struct PeerSummary {
     pub(crate) id: String,
     /// Not dormant.
     pub(crate) active: bool,
-    /// Handshake completed.
-    pub(crate) established: bool,
     /// The epoch the peer last advertised.
     pub(crate) epoch: Option<Epoch>,
 }
diff --git a/src/compaction/switch.rs b/src/compaction/switch.rs
index 06955c0..b13e9f2 100644
--- a/src/compaction/switch.rs
+++ b/src/compaction/switch.rs
@@ -141,6 +141,11 @@ async fn switch<H: Host>(host: &H, id: &str, record: &Record) -> Result<ReplaySt
     let previous = request.previous;
     let base = request.base_heads.clone();
     let retention = record.proposal.policy.archive_retention.clone();
+    // Only the coordinator carries the record into the new epoch: one writer, so the
+    // nodes don't all write the same path concurrently right after switching (a merge
+    // conflict, plus one change per node to sync). The epoch metadata in the snapshot
+    // keeps the essentials on every node anyway.
+    let carry_record = record.proposal.coordinator == host.node_id();
     let record_path = records::record_path(id, "");
 
     info!(compaction = %id, from = %previous, to = %expected, "Switching epoch");
@@ -172,8 +177,10 @@ async fn switch<H: Host>(host: &H, id: &str, record: &Record) -> Result<ReplaySt
             let mut doc = snapshot.doc.with_actor(ActorId::random());
 
             // Keep this compaction's record visible in the new epoch, for its history.
-            if let Err(error) = store::copy_path(&copy, &mut doc, &record_path) {
-                warn!(error = %error, "Could not carry the compaction record into the new epoch");
+            if carry_record {
+                if let Err(error) = store::copy_path(&copy, &mut doc, &record_path) {
+                    warn!(error = %error, "Could not carry the compaction record into the new epoch");
+                }
             }
 
             let heads = copy.get_heads();
-- 
cgit v1.3.1