bootstrap: replace pull by progress notify

2 files changed, 6 insertions, 0 deletions

diff --git a/src/state/host.rs b/src/state/host.rs
index e7921e4..5751998 100644
--- a/src/state/host.rs
+++ b/src/state/host.rs
@@ -330,6 +330,7 @@ impl Host for AppState {
                 .expect("rejoin task panicked")
             };
             state.publish_change();
+            state.join_progress.notify_one();
             if resumed {
                 crate::swarm::peer::announce(&state);
             }
@@ -360,6 +361,7 @@ impl Host for AppState {
                 .expect("rejoin task panicked")
             };
             state.after_epoch_switch().await;
+            state.join_progress.notify_one();
             if resumed {
                 crate::swarm::peer::announce(&state);
             }
diff --git a/src/state/mod.rs b/src/state/mod.rs
index 7c1299f..2902234 100644
--- a/src/state/mod.rs
+++ b/src/state/mod.rs
@@ -151,6 +151,9 @@ pub(crate) struct AppState {
     /// Something the neighbours are computed from may have changed: the member list or a
     /// peer's state (`swarm::topology::run_worker`, `swarm::topology::change_peer`).
     pub(crate) topology_changed: Arc<tokio::sync::Notify>,
+    /// Something a joining node waits for may have happened: the swarm ID learned, the
+    /// initial sync done, a rejoin ended, a seed found (`swarm::bootstrap`).
+    pub(crate) join_progress: Arc<tokio::sync::Notify>,
 
     /// While rejoining a newer epoch, the previous document, served read-only (and
     /// marked stale) instead of answering 503.
@@ -276,6 +279,7 @@ impl AppState {
                     discovered_swarm_id: Some(swarm_id),
                 };
                 debug!("Node transitioned from {old_lifecycle:?} {lifecycle:?}");
+                self.join_progress.notify_one();
                 Ok(())
             }
             NodeLifecycle::Joining {