Make startup aware of Incremental Snapshots (#19550)

This commit is contained in:
Brooks Prumo
2021-09-02 19:05:15 -05:00
committed by GitHub
parent 57f51352f6
commit d45ced0a5d
8 changed files with 337 additions and 92 deletions

View File

@ -836,7 +836,12 @@ pub fn bank_from_latest_snapshot_archives(
accounts_db_skip_shrink: bool,
verify_index: bool,
accounts_index_config: Option<AccountsIndexConfig>,
) -> Result<(Bank, BankFromArchiveTimings)> {
) -> Result<(
Bank,
BankFromArchiveTimings,
FullSnapshotArchiveInfo,
Option<IncrementalSnapshotArchiveInfo>,
)> {
let full_snapshot_archive_info = get_highest_full_snapshot_archive_info(&snapshot_archives_dir)
.ok_or(SnapshotError::NoSnapshotArchives)?;
@ -888,7 +893,12 @@ pub fn bank_from_latest_snapshot_archives(
),
)?;
Ok((bank, timings))
Ok((
bank,
timings,
full_snapshot_archive_info,
incremental_snapshot_archive_info,
))
}
/// Check to make sure the deserialized bank's slot and hash matches the snapshot archive's slot
@ -2713,7 +2723,7 @@ mod tests {
)
.unwrap();
let (deserialized_bank, _) = bank_from_latest_snapshot_archives(
let (deserialized_bank, ..) = bank_from_latest_snapshot_archives(
&bank_snapshots_dir,
&snapshot_archives_dir,
&[accounts_dir.as_ref().to_path_buf()],