Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

create and canonicalize account_paths #32037

Merged
merged 6 commits into from
Jun 9, 2023
Merged

create and canonicalize account_paths #32037

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3efbf08
create and canonicalize account_paths
apfitzge Jun 8, 2023
4157433
create_and_canonicalize_directories
apfitzge Jun 8, 2023
151f3c0
remove unneccessary <Vec<_>>
apfitzge Jun 8, 2023
04e8f94
ledger_path, I choose you!
apfitzge Jun 9, 2023
954cc4b
Use err Display instead of Debug
apfitzge Jun 9, 2023
286a1ad
Pull ledger_path out of Vec
apfitzge Jun 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions runtime/src/snapshot_utils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,6 +422,21 @@ pub enum VerifySlotDeltasError {
BadSlotHistory,
}

/// Creates directories if they do not exist, and canonicalizes the paths.
pub fn create_and_canonicalize_directories(directories: &[PathBuf]) -> Result<Vec<PathBuf>> {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

wasn't super happy about this returning a SnapshotError, since it's only somewhat related to snapshots. Somewhat of a hack because I want to keep info about which path caused the error which afaik isn't easy to do w/ IoError

directories
.iter()
.map(|path| {
std::fs::create_dir_all(path).map_err(|err| {
SnapshotError::IoWithSourceAndFile(err, "create_dir_all", path.clone())
})?;
path.canonicalize().map_err(|err| {
SnapshotError::IoWithSourceAndFile(err, "canonicalize", path.clone())
})
})
.collect()
}

/// Delete the files and subdirectories in a directory.
/// This is useful if the process does not have permission
/// to delete the top level directory it might be able to
Expand Down
30 changes: 13 additions & 17 deletions validator/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@ use {
runtime_config::RuntimeConfig,
snapshot_config::{SnapshotConfig, SnapshotUsage},
snapshot_utils::{
self, create_all_accounts_run_and_snapshot_dirs, ArchiveFormat, SnapshotVersion,
self, create_all_accounts_run_and_snapshot_dirs, create_and_canonicalize_directories,
steviez marked this conversation as resolved.
Show resolved Hide resolved
ArchiveFormat, SnapshotVersion,
},
},
solana_sdk::{
Expand Down Expand Up @@ -963,8 +964,7 @@ pub fn main() {
.map(BlockstoreRecoveryMode::from);

// Canonicalize ledger path to avoid issues with symlink creation
let _ = fs::create_dir_all(&ledger_path);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Interesting that we would ignore errors here...

Seems correct to not ignore those errors in the new code.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

History: #7877
Probably just the simplest/quickest way to get it created & not have an unwrap?

🤔 maybe some concerns about permissions? It's possible we have a ledger_dir w/ permissions to write inside the dir, but not permissions to write in the parent dir. To me it was not obvious what the result of create_dir_all would be just from reading the docs (it's Ok if ledger_path exists).

Agree it seems better to not ignore the errors.

let ledger_path = fs::canonicalize(&ledger_path).unwrap_or_else(|err| {
let ledger_path = create_and_canonicalize_directories(&[ledger_path]).unwrap_or_else(|err| {
eprintln!("Unable to access ledger path: {err:?}");
apfitzge marked this conversation as resolved.
Show resolved Hide resolved
exit(1);
});
Expand Down Expand Up @@ -1396,6 +1396,12 @@ pub fn main() {
} else {
vec![ledger_path.join("accounts")]
};
let account_paths = snapshot_utils::create_and_canonicalize_directories(&account_paths)
.unwrap_or_else(|err| {
eprintln!("Unable to access account path: {err:?}");
apfitzge marked this conversation as resolved.
Show resolved Hide resolved
exit(1);
});

let account_shrink_paths: Option<Vec<PathBuf>> =
values_t!(matches, "account_shrink_path", String)
.map(|shrink_paths| shrink_paths.into_iter().map(PathBuf::from).collect())
Expand All @@ -1413,20 +1419,10 @@ pub fn main() {
validator_config.account_snapshot_paths = account_snapshot_paths;

validator_config.account_shrink_paths = account_shrink_paths.map(|paths| {
paths
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we were doing the same thing in 2 places, just moved it to a function so we can also use this in ledger-tool when I get to checking that out.

.into_iter()
.map(|account_path| {
match fs::create_dir_all(&account_path)
.and_then(|_| fs::canonicalize(&account_path))
{
Ok(account_path) => account_path,
Err(err) => {
eprintln!("Unable to access account path: {account_path:?}, err: {err:?}");
exit(1);
}
}
})
.collect()
create_and_canonicalize_directories(&paths).unwrap_or_else(|err| {
eprintln!("Unable to access account shrink path: {err:?}");
apfitzge marked this conversation as resolved.
Show resolved Hide resolved
exit(1);
})
});

let maximum_local_snapshot_age = value_t_or_exit!(matches, "maximum_local_snapshot_age", u64);
Expand Down