Add spawn_blocking around the get_blocks GET request

must479 · May 9, 2024 · 05a3fa4 · 05a3fa4
1 parent 9a6ac11
commit 05a3fa4
Showing 1 changed file with 12 additions and 5 deletions.
diff --git a/node/rest/src/routes.rs b/node/rest/src/routes.rs
@@ -135,11 +135,18 @@ impl<N: Network, C: ConsensusStorage<N>, R: Routing<N>> Rest<N, C, R> {
             )));
         }
 
-        let blocks = cfg_into_iter!((start_height..end_height))
-            .map(|height| rest.ledger.get_block(height))
-            .collect::<Result<Vec<_>, _>>()?;
-
-        Ok(ErasedJson::pretty(blocks))
+        // Fetch the blocks from ledger.
+        match tokio::task::spawn_blocking(move || {
+            cfg_into_iter!((start_height..end_height))
+                .map(|height| rest.ledger.get_block(height))
+                .collect::<Result<Vec<_>, _>>()
+        })
+        .await
+        {
+            Ok(Ok(blocks)) => Ok(ErasedJson::pretty(blocks)),
+            Ok(Err(err)) => Err(RestError(format!("Failed to get blocks '{start_height}..{end_height}' - {err}"))),
+            Err(err) => Err(RestError(format!("Failed to get blocks '{start_height}..{end_height}' - {err}"))),
+        }
     }
 
     // GET /<network>/height/{blockHash}