Skip to content

fix: add retry to chain exchange in ForestStateCompute #6173

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hanabi1224 merged 2 commits into from
Oct 20, 2025
Merged

fix: add retry to chain exchange in ForestStateCompute #6173

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ce062e8
fix: add retry to chain exchange in ForestStateCompute
hanabi1224 Oct 20, 2025
2dc6968
Merge branch 'main' into hm/retry-chain-exchange-in-state-compute
hanabi1224 Oct 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 16 additions & 6 deletions src/rpc/methods/state.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ use fil_actor_miner_state::v10::{qa_power_for_weight, qa_power_max};
use fil_actor_verifreg_state::v13::ClaimID;
use fil_actors_shared::fvm_ipld_amt::Amt;
use fil_actors_shared::fvm_ipld_bitfield::BitField;
use futures::StreamExt;
use futures::{StreamExt as _, TryStreamExt as _};
use fvm_ipld_blockstore::Blockstore;
use fvm_ipld_encoding::{CborStore, DAG_CBOR};
pub use fvm_shared3::sector::StoragePower;
Expand Down Expand Up @@ -1483,18 +1483,28 @@ impl RpcMethod<2> for ForestStateCompute {
futures.push_front(async move {
if crate::chain_sync::load_full_tipset(&chain_store, ts.key()).is_err() {
// Backfill full tipset from the network
let fts = network_context
.chain_exchange_messages(None, &ts)
.await
.map_err(|e| anyhow::anyhow!(e))?;
const MAX_RETRIES: usize = 5;
let fts = 'retry_loop: {
Copy link
Copy Markdown
Contributor Author

@hanabi1224 hanabi1224 Oct 20, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's non-trival to get existing retry utils to compile here so implementing a retry loop manually

for i in 1..=MAX_RETRIES {
match network_context.chain_exchange_messages(None, &ts).await {
Ok(fts) => break 'retry_loop Ok(fts),
Err(e) if i >= MAX_RETRIES => break 'retry_loop Err(e),
Err(_) => continue,
}
}
Err("unreachable chain exchange error in ForestStateCompute".into())
}
.map_err(|e| {
anyhow::anyhow!("failed to download messages@{}: {e}", ts.epoch())
Copy link
Copy Markdown
Contributor

@elmattic elmattic Oct 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: some whitespace between messages and @ would help with reading

})?;
fts.persist(chain_store.blockstore())?;
}
anyhow::Ok(ts)
});
}

let mut results = Vec::with_capacity(n_epochs as _);
while let Some(Ok(ts)) = futures.next().await {
while let Some(ts) = futures.try_next().await? {
let epoch = ts.epoch();
let tipset_key = ts.key().clone();
let StateOutput { state_root, .. } = ctx
Expand Down
Loading