Remove bank_snapshots_dir param (#31249)

* Remove bank_snapshots_dir param

* Remove outdated comment

* Revert "Remove outdated comment"

This reverts commit e4441432bec57edb0dc22c4bacf4d48ce26ed818.

* Handle parent() error

* Fix format error

core/tests/snapshots.rs

@@ -246,7 +246,6 @@ fn run_bank_forks_snapshot_n<F>(
         AccountsPackageType::Snapshot(SnapshotType::FullSnapshot),
         &last_bank,
         &last_bank_snapshot_info,
-        bank_snapshots_dir,
         &snapshot_config.full_snapshot_archives_dir,
         &snapshot_config.incremental_snapshot_archives_dir,
         last_bank.get_snapshot_storages(None),
@@ -409,7 +408,6 @@ fn test_concurrent_snapshot_packaging(
             AccountsPackageType::Snapshot(SnapshotType::FullSnapshot),
             &bank,
             &bank_snapshot_info,
-            bank_snapshots_dir,
             full_snapshot_archives_dir,
             incremental_snapshot_archives_dir,
             snapshot_storages,
@@ -815,7 +813,6 @@ fn make_full_snapshot_archive(
     snapshot_utils::package_and_archive_full_snapshot(
         bank,
         &bank_snapshot_info,
-        &snapshot_config.bank_snapshots_dir,
         &snapshot_config.full_snapshot_archives_dir,
         &snapshot_config.incremental_snapshot_archives_dir,
         bank.get_snapshot_storages(None),
@@ -855,7 +852,6 @@ fn make_incremental_snapshot_archive(
         bank,
         incremental_snapshot_base_slot,
         &bank_snapshot_info,
-        &snapshot_config.bank_snapshots_dir,
         &snapshot_config.full_snapshot_archives_dir,
         &snapshot_config.incremental_snapshot_archives_dir,
         storages,

runtime/src/accounts_background_service.rs

@@ -366,7 +366,6 @@ impl SnapshotRequestHandler {
                     accounts_package_type,
                     &snapshot_root_bank,
                     &bank_snapshot_info,
-                    &self.snapshot_config.bank_snapshots_dir,
                     &self.snapshot_config.full_snapshot_archives_dir,
                     &self.snapshot_config.incremental_snapshot_archives_dir,
                     snapshot_storages,

runtime/src/snapshot_package.rs

@@ -9,7 +9,7 @@ use {
         snapshot_archive_info::{SnapshotArchiveInfo, SnapshotArchiveInfoGetter},
         snapshot_hash::SnapshotHash,
         snapshot_utils::{
-            self, ArchiveFormat, BankSnapshotInfo, Result, SnapshotVersion,
+            self, ArchiveFormat, BankSnapshotInfo, Result, SnapshotError, SnapshotVersion,
             SNAPSHOT_STATUS_CACHE_FILENAME, TMP_BANK_SNAPSHOT_PREFIX,
         },
     },
@@ -55,7 +55,6 @@ impl AccountsPackage {
         package_type: AccountsPackageType,
         bank: &Bank,
         bank_snapshot_info: &BankSnapshotInfo,
-        bank_snapshots_dir: impl AsRef<Path>,
         full_snapshot_archives_dir: impl AsRef<Path>,
         incremental_snapshot_archives_dir: impl AsRef<Path>,
         snapshot_storages: Vec<Arc<AccountStorageEntry>>,
@@ -80,6 +79,10 @@ impl AccountsPackage {
         }
 
         // Hard link the snapshot into a tmpdir, to ensure its not removed prior to packaging.
+        let bank_snapshot_dir = &bank_snapshot_info.snapshot_dir;
+        let bank_snapshots_dir = bank_snapshot_dir
+            .parent()
+            .ok_or_else(|| SnapshotError::InvalidSnapshotDirPath(bank_snapshot_dir.clone()))?;
         let snapshot_links = tempfile::Builder::new()
             .prefix(&format!("{}{}-", TMP_BANK_SNAPSHOT_PREFIX, bank.slot()))
             .tempdir_in(bank_snapshots_dir)?;
@@ -91,9 +94,7 @@ impl AccountsPackage {
             let snapshot_path = bank_snapshot_info.snapshot_path();
             let file_name = snapshot_utils::path_to_file_name_str(&snapshot_path)?;
             fs::hard_link(&snapshot_path, snapshot_hardlink_dir.join(file_name))?;
-            let status_cache_path = bank_snapshot_info
-                .snapshot_dir
-                .join(SNAPSHOT_STATUS_CACHE_FILENAME);
+            let status_cache_path = bank_snapshot_dir.join(SNAPSHOT_STATUS_CACHE_FILENAME);
             let status_cache_file_name = snapshot_utils::path_to_file_name_str(&status_cache_path)?;
             fs::hard_link(
                 &status_cache_path,

runtime/src/snapshot_utils.rs

@@ -357,6 +357,9 @@ pub enum SnapshotError {
     #[error("bank_snapshot_info new_from_dir failed: {0}")]
     NewFromDir(#[from] SnapshotNewFromDirError),
 
+    #[error("invalid snapshot dir path: {}", .0.display())]
+    InvalidSnapshotDirPath(PathBuf),
+
     #[error("invalid AppendVec path: {}", .0.display())]
     InvalidAppendVecPath(PathBuf),
 
@@ -3020,7 +3023,6 @@ pub fn bank_to_full_snapshot_archive(
     package_and_archive_full_snapshot(
         bank,
         &bank_snapshot_info,
-        &temp_dir,
         full_snapshot_archives_dir,
         incremental_snapshot_archives_dir,
         snapshot_storages,
@@ -3081,7 +3083,6 @@ pub fn bank_to_incremental_snapshot_archive(
         bank,
         full_snapshot_slot,
         &bank_snapshot_info,
-        &temp_dir,
         full_snapshot_archives_dir,
         incremental_snapshot_archives_dir,
         snapshot_storages,
@@ -3097,7 +3098,6 @@ pub fn bank_to_incremental_snapshot_archive(
 pub fn package_and_archive_full_snapshot(
     bank: &Bank,
     bank_snapshot_info: &BankSnapshotInfo,
-    bank_snapshots_dir: impl AsRef<Path>,
     full_snapshot_archives_dir: impl AsRef<Path>,
     incremental_snapshot_archives_dir: impl AsRef<Path>,
     snapshot_storages: Vec<Arc<AccountStorageEntry>>,
@@ -3110,7 +3110,6 @@ pub fn package_and_archive_full_snapshot(
         AccountsPackageType::Snapshot(SnapshotType::FullSnapshot),
         bank,
         bank_snapshot_info,
-        bank_snapshots_dir,
         &full_snapshot_archives_dir,
         &incremental_snapshot_archives_dir,
         snapshot_storages,
@@ -3149,7 +3148,6 @@ pub fn package_and_archive_incremental_snapshot(
     bank: &Bank,
     incremental_snapshot_base_slot: Slot,
     bank_snapshot_info: &BankSnapshotInfo,
-    bank_snapshots_dir: impl AsRef<Path>,
     full_snapshot_archives_dir: impl AsRef<Path>,
     incremental_snapshot_archives_dir: impl AsRef<Path>,
     snapshot_storages: Vec<Arc<AccountStorageEntry>>,
@@ -3164,7 +3162,6 @@ pub fn package_and_archive_incremental_snapshot(
         )),
         bank,
         bank_snapshot_info,
-        bank_snapshots_dir,
         &full_snapshot_archives_dir,
         &incremental_snapshot_archives_dir,
         snapshot_storages,