From 0225c8050d3e0cfb03c6217c8a5593dbdc8aa743 Mon Sep 17 00:00:00 2001 From: Ryo Onodera Date: Wed, 3 Jun 2020 18:45:48 +0900 Subject: [PATCH 1/3] Don't share same snapshot dir for secondary access (#10384) automerge (cherry picked from commit b515cc3ae5cfa5f3b7cbec634700e467ec4fbe9f) # Conflicts: # ledger-tool/src/main.rs --- ledger-tool/src/main.rs | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/ledger-tool/src/main.rs b/ledger-tool/src/main.rs index 1a67acf606d..72b62debccd 100644 --- a/ledger-tool/src/main.rs +++ b/ledger-tool/src/main.rs @@ -532,16 +532,26 @@ fn load_bank_forks( process_options: ProcessOptions, access_type: AccessType, ) -> 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") { None } else { Some(SnapshotConfig { snapshot_interval_slots: 0, // Value doesn't matter snapshot_package_output_path: ledger_path.clone(), +<<<<<<< HEAD snapshot_path: ledger_path.clone().join("snapshot"), +======= + snapshot_path, + compression: CompressionType::Bzip2, +>>>>>>> b515cc3ae... Don't share same snapshot dir for secondary access (#10384) }) }; - let blockstore = open_blockstore(&ledger_path, access_type); let account_paths = if let Some(account_paths) = arg_matches.value_of("account_paths") { if !blockstore.is_primary_access() { // Be defenstive, when default account dir is explicitly specified, it's still possible From 1aa92ba2a8deabdbfcbb5d7b4fe29234f5a2db1d Mon Sep 17 00:00:00 2001 From: Ryo Onodera Date: Wed, 3 Jun 2020 20:47:06 +0900 Subject: [PATCH 2/3] Fix conflict --- ledger-tool/src/main.rs | 4 ---- 1 file changed, 4 deletions(-) diff --git a/ledger-tool/src/main.rs b/ledger-tool/src/main.rs index 72b62debccd..11d58763834 100644 --- a/ledger-tool/src/main.rs +++ b/ledger-tool/src/main.rs @@ -544,12 +544,8 @@ fn load_bank_forks( Some(SnapshotConfig { snapshot_interval_slots: 0, // Value doesn't matter snapshot_package_output_path: ledger_path.clone(), -<<<<<<< HEAD - snapshot_path: ledger_path.clone().join("snapshot"), -======= snapshot_path, compression: CompressionType::Bzip2, ->>>>>>> b515cc3ae... Don't share same snapshot dir for secondary access (#10384) }) }; let account_paths = if let Some(account_paths) = arg_matches.value_of("account_paths") { From e31b2c023e2a612b4a2a360892b040a76e027485 Mon Sep 17 00:00:00 2001 From: Ryo Onodera Date: Wed, 3 Jun 2020 20:48:19 +0900 Subject: [PATCH 3/3] Really fix conflict... --- ledger-tool/src/main.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/ledger-tool/src/main.rs b/ledger-tool/src/main.rs index 11d58763834..0ff6c9c4196 100644 --- a/ledger-tool/src/main.rs +++ b/ledger-tool/src/main.rs @@ -545,7 +545,6 @@ fn load_bank_forks( snapshot_interval_slots: 0, // Value doesn't matter snapshot_package_output_path: ledger_path.clone(), snapshot_path, - compression: CompressionType::Bzip2, }) }; let account_paths = if let Some(account_paths) = arg_matches.value_of("account_paths") {