fix

Author: hanabi1224

scripts/tests/calibnet_other_check.sh

@@ -27,7 +27,7 @@ fi
 forest_check_db_stats
 echo "Run snapshot GC"
 forest_run_snap_gc
-sleep 5
+forest_wait_api
 echo "Wait the node to sync"
 forest_wait_for_sync
 forest_check_db_stats

src/cli/subcommands/chain_cmd/prune.rs

@@ -8,15 +8,18 @@ use std::time::Duration;
 #[derive(Debug, Subcommand)]
 pub enum ChainPruneCommands {
     /// Run snapshot GC
-    Snap,
+    Snap {
+        #[arg(long)]
+        no_wait: bool,
+    },
 }
 
 impl ChainPruneCommands {
     pub async fn run(self, client: rpc::Client) -> anyhow::Result<()> {
         match self {
-            Self::Snap => {
+            Self::Snap { no_wait } => {
                 client
-                    .call(ChainPruneSnapshot::request(())?.with_timeout(Duration::MAX))
+                    .call(ChainPruneSnapshot::request((!no_wait,))?.with_timeout(Duration::MAX))
                     .await?;
             }
         }

src/db/gc/snapshot.rs

@@ -87,13 +87,18 @@ where
         }
     }
 
-    pub fn trigger(&self) -> flume::Receiver<()> {
-        let (progress_tx, progress_rx) = flume::unbounded();
-        *self.progress_tx.write() = Some(progress_tx);
+    pub fn trigger(&self) -> anyhow::Result<flume::Receiver<()>> {
+        if self.running.load(Ordering::Relaxed) {
+            anyhow::bail!("snap gc has already been running");
+        }
+
         if self.trigger_tx.try_send(()).is_err() {
-            tracing::warn!("snap gc has already been triggered");
+            anyhow::bail!("snap gc has already been triggered");
         }
-        progress_rx
+
+        let (progress_tx, progress_rx) = flume::unbounded();
+        *self.progress_tx.write() = Some(progress_tx);
+        Ok(progress_rx)
     }
 
     async fn export_snapshot(&self) -> anyhow::Result<()> {

src/rpc/methods/chain.rs

@@ -196,22 +196,22 @@ impl RpcMethod<1> for ChainGetMessagesInTipset {
 }
 
 pub enum ChainPruneSnapshot {}
-impl RpcMethod<0> for ChainPruneSnapshot {
+impl RpcMethod<1> for ChainPruneSnapshot {
     const NAME: &'static str = "Forest.SnapshotGC";
-    const PARAM_NAMES: [&'static str; 0] = [];
+    const PARAM_NAMES: [&'static str; 1] = ["blocking"];
     const API_PATHS: BitFlags<ApiPaths> = ApiPaths::all();
     const PERMISSION: Permission = Permission::Admin;
 
-    type Params = ();
+    type Params = (bool,);
     type Ok = ();
 
     async fn handle(
         _ctx: Ctx<impl Blockstore + Send + Sync + 'static>,
-        (): Self::Params,
+        (blocking,): Self::Params,
     ) -> Result<Self::Ok, ServerError> {
         if let Some(gc) = crate::daemon::GLOBAL_SNAPSHOT_GC.get() {
-            let progress_rx = gc.trigger();
-            while progress_rx.recv_async().await.is_ok() {}
+            let progress_rx = gc.trigger()?;
+            while blocking && progress_rx.recv_async().await.is_ok() {}
             Ok(())
         } else {
             Err(anyhow::anyhow!("snapshot gc is not enabled").into())