Ledger-tool: only require ledger dir when necessary (backport #21575) (…

…#21578) * Ledger-tool: only require ledger dir when necessary (#21575) * Don't canonicalize ledger_path unless ledger_path will be used * Single use statement (cherry picked from commit 2b269db) # Conflicts: # ledger-tool/src/main.rs * Fix conflicts Co-authored-by: Tyera Eulberg <[email protected]> Co-authored-by: Tyera Eulberg <[email protected]>
solana-labs · Dec 3, 2021 · 5a7b487 · 5a7b487
1 parent 416fccf
commit 5a7b487
Show file tree

Hide file tree

Showing 3 changed files with 1,496 additions and 1,442 deletions.
diff --git a/ledger-tool/src/bigtable.rs b/ledger-tool/src/bigtable.rs
@@ -1,23 +1,26 @@
 /// The `bigtable` subcommand
-use clap::{
-    value_t, value_t_or_exit, values_t_or_exit, App, AppSettings, Arg, ArgMatches, SubCommand,
-};
-use solana_clap_utils::{
-    input_parsers::pubkey_of,
-    input_validators::{is_slot, is_valid_pubkey},
-};
-use solana_cli_output::{
-    display::println_transaction, CliBlock, CliTransaction, CliTransactionConfirmation,
-    OutputFormat,
-};
-use solana_ledger::{blockstore::Blockstore, blockstore_db::AccessType};
-use solana_sdk::{clock::Slot, pubkey::Pubkey, signature::Signature};
-use solana_transaction_status::{ConfirmedBlock, EncodedTransaction, UiTransactionEncoding};
-use std::{
-    path::Path,
-    process::exit,
-    result::Result,
-    sync::{atomic::AtomicBool, Arc},
+use {
+    crate::ledger_path::canonicalize_ledger_path,
+    clap::{
+        value_t, value_t_or_exit, values_t_or_exit, App, AppSettings, Arg, ArgMatches, SubCommand,
+    },
+    solana_clap_utils::{
+        input_parsers::pubkey_of,
+        input_validators::{is_slot, is_valid_pubkey},
+    },
+    solana_cli_output::{
+        display::println_transaction, CliBlock, CliTransaction, CliTransactionConfirmation,
+        OutputFormat,
+    },
+    solana_ledger::{blockstore::Blockstore, blockstore_db::AccessType},
+    solana_sdk::{clock::Slot, pubkey::Pubkey, signature::Signature},
+    solana_transaction_status::{ConfirmedBlock, EncodedTransaction, UiTransactionEncoding},
+    std::{
+        path::Path,
+        process::exit,
+        result::Result,
+        sync::{atomic::AtomicBool, Arc},
+    },
 };
 
 async fn upload(
@@ -426,8 +429,11 @@ pub fn bigtable_process_command(ledger_path: &Path, matches: &ArgMatches<'_>) {
             let ending_slot = value_t!(arg_matches, "ending_slot", Slot).ok();
             let allow_missing_metadata = arg_matches.is_present("allow_missing_metadata");
             let force_reupload = arg_matches.is_present("force_reupload");
-            let blockstore =
-                crate::open_blockstore(ledger_path, AccessType::TryPrimaryThenSecondary, None);
+            let blockstore = crate::open_blockstore(
+                &canonicalize_ledger_path(ledger_path),
+                AccessType::TryPrimaryThenSecondary,
+                None,
+            );
 
             runtime.block_on(upload(
                 blockstore,

diff --git a/ledger-tool/src/ledger_path.rs b/ledger-tool/src/ledger_path.rs
@@ -0,0 +1,30 @@
+use {
+    clap::{value_t, ArgMatches},
+    std::{
+        fs,
+        path::{Path, PathBuf},
+        process::exit,
+    },
+};
+
+pub fn parse_ledger_path(matches: &ArgMatches<'_>, name: &str) -> PathBuf {
+    PathBuf::from(value_t!(matches, name, String).unwrap_or_else(|_err| {
+        eprintln!(
+            "Error: Missing --ledger <DIR> argument.\n\n{}",
+            matches.usage()
+        );
+        exit(1);
+    }))
+}
+
+// Canonicalize ledger path to avoid issues with symlink creation
+pub fn canonicalize_ledger_path(ledger_path: &Path) -> PathBuf {
+    fs::canonicalize(&ledger_path).unwrap_or_else(|err| {
+        eprintln!(
+            "Unable to access ledger path '{}': {}",
+            ledger_path.display(),
+            err
+        );
+        exit(1);
+    })
+}