getblocks retry 5 times on "Block not found on disk" before giving up

src/new_index/fetch.rs

@@ -7,6 +7,7 @@ use bitcoin::consensus::encode::{deserialize, Decodable};
 #[cfg(feature = "liquid")]
 use elements::encode::{deserialize, Decodable};
 
+use core::panic;
 use std::collections::HashMap;
 use std::fs;
 use std::io::Cursor;
@@ -82,9 +83,31 @@ fn bitcoind_fetcher(
         spawn_thread("bitcoind_fetcher", move || {
             for entries in new_headers.chunks(100) {
                 let blockhashes: Vec<BlockHash> = entries.iter().map(|e| *e.hash()).collect();
-                let blocks = daemon
-                    .getblocks(&blockhashes)
-                    .expect("failed to get blocks from bitcoind");
+
+                let mut attempts = 5;
+                let blocks = loop {
+                    attempts -= 1;
+
+                    match daemon.getblocks(&blockhashes) {
+                        Ok(blocks) => break blocks,
+                        Err(e) => {
+                            let err_msg = format!("{e:?}");
+                            if err_msg.contains("Block not found on disk") {
+                                // There is a small chance the node returns the header but didn't finish to index the block
+                                log::warn!(
+                                    "getblocks failing with: {e:?} trying {attempts} more time"
+                                )
+                            } else {
+                                panic!("failed to get blocks from bitcoind: {}", err_msg);
+                            }
+                        }
+                    }
+                    if attempts == 0 {
+                        panic!("failed to get blocks from bitcoind")
+                    }
+                    thread::sleep(std::time::Duration::from_secs(1));
+                };
+
                 assert_eq!(blocks.len(), entries.len());
                 let block_entries: Vec<BlockEntry> = blocks
                     .into_iter()