Skip to content
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

Protect against possible panics in header/horizon sync #2219

Merged
merged 1 commit into from
Sep 15, 2020
Merged

Protect against possible panics in header/horizon sync #2219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 13 additions & 4 deletions base_layer/core/src/base_node/state_machine_service/states/header_sync.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,22 +145,31 @@ struct HeaderSynchronisation<'a, 'b, B> {
impl<B: BlockchainBackend + 'static> HeaderSynchronisation<'_, '_, B> {
pub async fn synchronize(&mut self) -> Result<(), HeaderSyncError> {
let tip_header = async_db::fetch_tip_header(self.db()).await?;
let tip_header_height = tip_header.height;
if tip_header_height >= self.sync_height {
debug!(
target: LOG_TARGET,
"The current tip height ({}) is greater than the requested sync height ({}). Headers already synced.",
tip_header_height,
self.sync_height
);
return Ok(());
}
debug!(
target: LOG_TARGET,
"Syncing from height {} to sync height {}.", tip_header.height, self.sync_height
);

trace!(target: LOG_TARGET, "Synchronizing headers");
self.synchronize_headers(&tip_header).await?;
self.synchronize_headers(tip_header_height).await?;

Ok(())
}

async fn synchronize_headers(&mut self, tip_header: &BlockHeader) -> Result<(), HeaderSyncError> {
let tip_height = tip_header.height;
async fn synchronize_headers(&mut self, tip_header_height: u64) -> Result<(), HeaderSyncError> {
let config = self.shared.config.block_sync_config;

let chunks = VecChunkIter::new(tip_height + 1, self.sync_height + 1, config.header_request_size);
let chunks = VecChunkIter::new(tip_header_height + 1, self.sync_height + 1, config.header_request_size);
for block_nums in chunks {
let num_sync_peers = self.sync_peers.len();
for attempt in 1..=num_sync_peers {
Expand Down
6 changes: 6 additions & 0 deletions base_layer/core/src/base_node/state_machine_service/states/horizon_state_sync/state_sync.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,6 +392,12 @@ impl<B: BlockchainBackend + 'static> HorizonStateSynchronization<'_, '_, '_, B>
config.max_sync_request_retry_attempts,
)
.await?;

if local_num_utxo_nodes >= remote_num_utxo_nodes {
debug!(target: LOG_TARGET, "UTXOs and range proofs are already synchronized.");
return Ok(());
}

debug!(
target: LOG_TARGET,
"Synchronizing {} UTXO MMR nodes from {} to {}",
Expand Down