gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Don't share same snapshot dir for secondary access (#10384) (#10387)

Browse Source 
automerge
This commit is contained in:
mergify[bot]
2020-06-03 04:12:51 -07:00
committed by GitHub
parent 05c052e212
commit a5c3ae3cef
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ledger-tool/src/main.rs
View File

@@ -557,17 +557,22 @@ fn load_bank_forks(
process_options: ProcessOptions, process_options: ProcessOptions,
access_type: AccessType, access_type: AccessType,
) -> bank_forks_utils::LoadResult { ) -> bank_forks_utils::LoadResult {
let blockstore = open_blockstore(&ledger_path, access_type);
let snapshot_path = ledger_path.clone().join(if blockstore.is_primary_access() {
"snapshot"
} else {
"snapshot.ledger-tool"
});
let snapshot_config = if arg_matches.is_present("no_snapshot") { let snapshot_config = if arg_matches.is_present("no_snapshot") {
None None
} else { } else {
Some(SnapshotConfig { Some(SnapshotConfig {
snapshot_interval_slots: 0, // Value doesn't matter snapshot_interval_slots: 0, // Value doesn't matter
snapshot_package_output_path: ledger_path.clone(), snapshot_package_output_path: ledger_path.clone(),
snapshot_path: ledger_path.clone().join("snapshot"), snapshot_path,
compression: CompressionType::Bzip2, compression: CompressionType::Bzip2,
}) })
}; };
let blockstore = open_blockstore(&ledger_path, access_type);
let account_paths = if let Some(account_paths) = arg_matches.value_of("account_paths") { let account_paths = if let Some(account_paths) = arg_matches.value_of("account_paths") {
if !blockstore.is_primary_access() { if !blockstore.is_primary_access() {
// Be defenstive, when default account dir is explicitly specified, it's still possible // Be defenstive, when default account dir is explicitly specified, it's still possible