zecfoundation
/
zebra
mirror of https://github.com/ZcashFoundation/zebra.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Moves disk IO to blocking tasks

This commit is contained in:
Arya 2024-06-13 18:09:19 -04:00
parent a1ad80f75b
commit c9319e0f51
1 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
zebra-rpc/src/sync.rs
View File

@ -73,6 +73,7 @@ impl TrustedChainSync {
/// Starts syncing blocks from the node's non-finalized best chain.
async fn sync(&mut self) {
self.try_catch_up_with_primary().await;
let mut last_chain_tip_hash =
if let Some(finalized_tip_block) = self.finalized_chain_tip_block().await {
let last_chain_tip_hash = finalized_tip_block.hash;
@ -92,13 +93,7 @@ impl TrustedChainSync {
"got a chain tip change"
);
let catch_up_result = self.db.try_catch_up_with_primary();
info!(?catch_up_result, "trying to catch up to primary");
// TODO: do in spawn_blocking
if self.non_finalized_state.chain_count() == 0 && self.db.contains_hash(target_tip_hash)
{
if self.is_finalized_tip_change(target_tip_hash).await {
let block = self.finalized_chain_tip_block().await.expect(
"should have genesis block after successful bestblockheightandhash response",
);
@ -194,6 +189,29 @@ impl TrustedChainSync {
}
}
async fn try_catch_up_with_primary(&self) {
let db = self.db.clone();
tokio::task::spawn_blocking(move || {
let catch_up_result = db.try_catch_up_with_primary();
tracing::debug!(?catch_up_result, "trying to catch up to primary");
})
.wait_for_panics()
.await
}
async fn is_finalized_tip_change(&self, target_tip_hash: block::Hash) -> bool {
self.non_finalized_state.chain_count() == 0 && {
let db = self.db.clone();
tokio::task::spawn_blocking(move || {
let catch_up_result = db.try_catch_up_with_primary();
tracing::debug!(?catch_up_result, "trying to catch up to primary");
db.contains_hash(target_tip_hash)
})
.wait_for_panics()
.await
}
}
/// Returns the current tip height and hash
async fn next_block_height_and_prev_hash(&self) -> (block::Height, block::Hash) {
if let Some(tip) = self.non_finalized_state.best_tip() {