1 files changed, 20 insertions, 1 deletions
diff --git a/src/remake/local.rs b/src/remake/local.rs
index 35a4ff1..787bd5e 100644
--- a/src/remake/local.rs
+++ b/src/remake/local.rs
@@ -12,7 +12,7 @@ use automerge::AutoCommit;
 use serde::Serialize;
 use tokio::time::Instant;
 
-use super::records::{unix_millis, Retention};
+use super::records::{Retention, unix_millis};
 use super::snapshot::Snapshot;
 use crate::document::replica::Epoch;
 
@@ -34,6 +34,8 @@ struct Inner {
     catch_up: Option<CatchUp>,
     /// A rejoin in progress: the node syncs an empty document of a newer epoch.
     rejoin: Option<Rejoin>,
+    /// While the rejoin downloads the target epoch's snapshot (`catchup`), sync waits.
+    fetching_snapshot: Option<Epoch>,
     quarantine: Vec<Quarantined>,
 }
 
@@ -211,6 +213,23 @@ impl RemakeState {
         self.lock().rejoin.take()
     }
 
+    /// Whether sync should wait: a rejoin is downloading its epoch's snapshot.
+    pub(crate) fn fetching_snapshot(&self) -> bool {
+        self.lock().fetching_snapshot.is_some()
+    }
+
+    pub(crate) fn set_fetching_snapshot(&self, target: Option<Epoch>) {
+        self.lock().fetching_snapshot = target;
+    }
+
+    /// The rejoin of `target`, if still in progress, gets its full time for the sync
+    /// that follows the download.
+    pub(crate) fn restart_rejoin_clock(&self, target: Epoch) {
+        if let Some(rejoin) = self.lock().rejoin.as_mut().filter(|r| r.target == target) {
+            rejoin.started = Instant::now();
+        }
+    }
+
     pub(crate) fn add_quarantine(&self, quarantined: Quarantined) {
         self.lock().quarantine.push(quarantined);
     }