blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

AccountsBackgroundService gracefully exits when snapshot request handling errors (#32543)

This commit is contained in:
Brooks 2023-07-20 11:53:06 -04:00 committed by GitHub
parent 0f70098410
commit 3fbfac41da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
runtime/src/accounts_background_service.rs
View File

@ -392,8 +392,7 @@ impl SnapshotRequestHandler {
&snapshot_storages, &snapshot_storages,
self.snapshot_config.snapshot_version, self.snapshot_config.snapshot_version,
status_cache_slot_deltas, status_cache_slot_deltas,
) )?;
.expect("snapshot bank");
AccountsPackage::new_for_snapshot( AccountsPackage::new_for_snapshot(
accounts_package_type, accounts_package_type,
&snapshot_root_bank, &snapshot_root_bank,
@ -404,8 +403,7 @@ impl SnapshotRequestHandler {
self.snapshot_config.archive_format, self.snapshot_config.archive_format,
self.snapshot_config.snapshot_version, self.snapshot_config.snapshot_version,
accounts_hash_for_testing, accounts_hash_for_testing,
) )?
.expect("new accounts package for snapshot")
} }
SnapshotRequestType::EpochAccountsHash => { SnapshotRequestType::EpochAccountsHash => {
// skip the bank snapshot, just make an accounts package to send to AHV // skip the bank snapshot, just make an accounts package to send to AHV
@ -643,12 +641,16 @@ impl AccountsBackgroundService {
if let Some(snapshot_handle_result) = snapshot_handle_result { if let Some(snapshot_handle_result) = snapshot_handle_result {
// Safe, see proof above // Safe, see proof above
if let Ok(snapshot_block_height) = snapshot_handle_result { match snapshot_handle_result {
assert!(last_cleaned_block_height <= snapshot_block_height); Ok(snapshot_block_height) => {
last_cleaned_block_height = snapshot_block_height; assert!(last_cleaned_block_height <= snapshot_block_height);
} else { last_cleaned_block_height = snapshot_block_height;
exit.store(true, Ordering::Relaxed); }
return; Err(err) => {
error!("Stopping AccountsBackgroundService! Fatal error while handling snapshot requests: {err}");
exit.store(true, Ordering::Relaxed);
break;
}
} }
} else { } else {
if bank.block_height() - last_cleaned_block_height if bank.block_height() - last_cleaned_block_height