Tests get snapshot archive format from snapshot config (#32209)
This commit is contained in:
parent
5c679e458b
commit
bfaf073ecf
|
@ -29,7 +29,7 @@ use {
|
||||||
snapshot_hash::SnapshotHash,
|
snapshot_hash::SnapshotHash,
|
||||||
snapshot_package::{AccountsPackage, AccountsPackageType, SnapshotPackage, SnapshotType},
|
snapshot_package::{AccountsPackage, AccountsPackageType, SnapshotPackage, SnapshotType},
|
||||||
snapshot_utils::{
|
snapshot_utils::{
|
||||||
self, ArchiveFormat,
|
self,
|
||||||
SnapshotVersion::{self, V1_2_0},
|
SnapshotVersion::{self, V1_2_0},
|
||||||
},
|
},
|
||||||
status_cache::MAX_CACHE_ENTRIES,
|
status_cache::MAX_CACHE_ENTRIES,
|
||||||
|
@ -140,31 +140,22 @@ fn restore_from_snapshot(
|
||||||
old_genesis_config: &GenesisConfig,
|
old_genesis_config: &GenesisConfig,
|
||||||
account_paths: &[PathBuf],
|
account_paths: &[PathBuf],
|
||||||
) {
|
) {
|
||||||
let full_snapshot_archives_dir = old_bank_forks
|
let snapshot_config = old_bank_forks.snapshot_config.as_ref().unwrap();
|
||||||
.snapshot_config
|
|
||||||
.as_ref()
|
|
||||||
.map(|c| &c.full_snapshot_archives_dir)
|
|
||||||
.unwrap();
|
|
||||||
|
|
||||||
let old_last_bank = old_bank_forks.get(old_last_slot).unwrap();
|
let old_last_bank = old_bank_forks.get(old_last_slot).unwrap();
|
||||||
|
|
||||||
let check_hash_calculation = false;
|
let check_hash_calculation = false;
|
||||||
let full_snapshot_archive_path = snapshot_utils::build_full_snapshot_archive_path(
|
let full_snapshot_archive_path = snapshot_utils::build_full_snapshot_archive_path(
|
||||||
full_snapshot_archives_dir,
|
&snapshot_config.full_snapshot_archives_dir,
|
||||||
old_last_bank.slot(),
|
old_last_bank.slot(),
|
||||||
&old_last_bank.get_snapshot_hash(),
|
&old_last_bank.get_snapshot_hash(),
|
||||||
ArchiveFormat::TarBzip2,
|
snapshot_config.archive_format,
|
||||||
);
|
);
|
||||||
let full_snapshot_archive_info =
|
let full_snapshot_archive_info =
|
||||||
FullSnapshotArchiveInfo::new_from_path(full_snapshot_archive_path).unwrap();
|
FullSnapshotArchiveInfo::new_from_path(full_snapshot_archive_path).unwrap();
|
||||||
|
|
||||||
let (deserialized_bank, _timing) = snapshot_utils::bank_from_snapshot_archives(
|
let (deserialized_bank, _timing) = snapshot_utils::bank_from_snapshot_archives(
|
||||||
account_paths,
|
account_paths,
|
||||||
&old_bank_forks
|
&snapshot_config.bank_snapshots_dir,
|
||||||
.snapshot_config
|
|
||||||
.as_ref()
|
|
||||||
.unwrap()
|
|
||||||
.bank_snapshots_dir,
|
|
||||||
&full_snapshot_archive_info,
|
&full_snapshot_archive_info,
|
||||||
None,
|
None,
|
||||||
old_genesis_config,
|
old_genesis_config,
|
||||||
|
@ -255,7 +246,7 @@ fn run_bank_forks_snapshot_n<F>(
|
||||||
&snapshot_config.full_snapshot_archives_dir,
|
&snapshot_config.full_snapshot_archives_dir,
|
||||||
&snapshot_config.incremental_snapshot_archives_dir,
|
&snapshot_config.incremental_snapshot_archives_dir,
|
||||||
last_bank.get_snapshot_storages(None),
|
last_bank.get_snapshot_storages(None),
|
||||||
ArchiveFormat::TarBzip2,
|
snapshot_config.archive_format,
|
||||||
snapshot_version,
|
snapshot_version,
|
||||||
None,
|
None,
|
||||||
)
|
)
|
||||||
|
@ -471,7 +462,7 @@ fn test_concurrent_snapshot_packaging(
|
||||||
// this needs to match the hash value that we reserialize with later. It is complicated, so just use default.
|
// this needs to match the hash value that we reserialize with later. It is complicated, so just use default.
|
||||||
// This hash value is just used to build the file name. Since this is mocked up test code, it is sufficient to pass default here.
|
// This hash value is just used to build the file name. Since this is mocked up test code, it is sufficient to pass default here.
|
||||||
&SnapshotHash(Hash::default()),
|
&SnapshotHash(Hash::default()),
|
||||||
ArchiveFormat::TarBzip2,
|
snapshot_config.archive_format,
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -569,7 +560,7 @@ fn test_concurrent_snapshot_packaging(
|
||||||
snapshot_utils::verify_snapshot_archive(
|
snapshot_utils::verify_snapshot_archive(
|
||||||
saved_archive_path.unwrap(),
|
saved_archive_path.unwrap(),
|
||||||
saved_snapshots_dir.path(),
|
saved_snapshots_dir.path(),
|
||||||
ArchiveFormat::TarBzip2,
|
snapshot_config.archive_format,
|
||||||
snapshot_utils::VerifyBank::NonDeterministic,
|
snapshot_utils::VerifyBank::NonDeterministic,
|
||||||
saved_slot,
|
saved_slot,
|
||||||
);
|
);
|
||||||
|
|
|
@ -44,9 +44,7 @@ use {
|
||||||
snapshot_archive_info::SnapshotArchiveInfoGetter,
|
snapshot_archive_info::SnapshotArchiveInfoGetter,
|
||||||
snapshot_config::SnapshotConfig,
|
snapshot_config::SnapshotConfig,
|
||||||
snapshot_package::SnapshotType,
|
snapshot_package::SnapshotType,
|
||||||
snapshot_utils::{
|
snapshot_utils::{self, create_accounts_run_and_snapshot_dirs},
|
||||||
self, create_accounts_run_and_snapshot_dirs, ArchiveFormat, SnapshotVersion,
|
|
||||||
},
|
|
||||||
vote_parser,
|
vote_parser,
|
||||||
},
|
},
|
||||||
solana_sdk::{
|
solana_sdk::{
|
||||||
|
@ -1347,7 +1345,10 @@ fn test_snapshots_blockstore_floor() {
|
||||||
.into_path(),
|
.into_path(),
|
||||||
archive_info.slot(),
|
archive_info.slot(),
|
||||||
archive_info.hash(),
|
archive_info.hash(),
|
||||||
ArchiveFormat::TarBzip2,
|
validator_snapshot_test_config
|
||||||
|
.validator_config
|
||||||
|
.snapshot_config
|
||||||
|
.archive_format,
|
||||||
);
|
);
|
||||||
fs::hard_link(archive_info.path(), validator_archive_path).unwrap();
|
fs::hard_link(archive_info.path(), validator_archive_path).unwrap();
|
||||||
let slot_floor = archive_info.slot();
|
let slot_floor = archive_info.slot();
|
||||||
|
@ -2165,7 +2166,7 @@ fn create_snapshot_to_hard_fork(
|
||||||
};
|
};
|
||||||
let ledger_path = blockstore.ledger_path();
|
let ledger_path = blockstore.ledger_path();
|
||||||
let genesis_config = open_genesis_config(ledger_path, u64::max_value());
|
let genesis_config = open_genesis_config(ledger_path, u64::max_value());
|
||||||
let snapshot_config = Some(create_simple_snapshot_config(ledger_path));
|
let snapshot_config = create_simple_snapshot_config(ledger_path);
|
||||||
let (bank_forks, ..) = bank_forks_utils::load(
|
let (bank_forks, ..) = bank_forks_utils::load(
|
||||||
&genesis_config,
|
&genesis_config,
|
||||||
blockstore,
|
blockstore,
|
||||||
|
@ -2175,7 +2176,7 @@ fn create_snapshot_to_hard_fork(
|
||||||
.0,
|
.0,
|
||||||
],
|
],
|
||||||
None,
|
None,
|
||||||
snapshot_config.as_ref(),
|
Some(&snapshot_config),
|
||||||
process_options,
|
process_options,
|
||||||
None,
|
None,
|
||||||
None,
|
None,
|
||||||
|
@ -2188,10 +2189,10 @@ fn create_snapshot_to_hard_fork(
|
||||||
let full_snapshot_archive_info = snapshot_utils::bank_to_full_snapshot_archive(
|
let full_snapshot_archive_info = snapshot_utils::bank_to_full_snapshot_archive(
|
||||||
ledger_path,
|
ledger_path,
|
||||||
&bank,
|
&bank,
|
||||||
Some(SnapshotVersion::default()),
|
Some(snapshot_config.snapshot_version),
|
||||||
ledger_path,
|
ledger_path,
|
||||||
ledger_path,
|
ledger_path,
|
||||||
ArchiveFormat::TarZstd,
|
snapshot_config.archive_format,
|
||||||
NonZeroUsize::new(1).unwrap(),
|
NonZeroUsize::new(1).unwrap(),
|
||||||
NonZeroUsize::new(1).unwrap(),
|
NonZeroUsize::new(1).unwrap(),
|
||||||
)
|
)
|
||||||
|
|
Loading…
Reference in New Issue