Add run parent directory for accounts files #29794
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
brooksprumo
reviewed
Jan 20, 2023
brooksprumo
reviewed
Jan 23, 2023
brooksprumo
reviewed
Jan 23, 2023
brooksprumo
reviewed
Jan 23, 2023
apfitzge
reviewed
Jan 24, 2023
There was a problem hiding this comment.
A few minor things. Last thing I think should be fixed is the inner result unwrapping @brooksprumo highlighted (I also commented)
brooksprumo
reviewed
Jan 24, 2023
brooksprumo
reviewed
Jan 24, 2023
xiangzhu70
force-pushed
the
account_path_add_run_parent
branch
from
4b7aa8a to
d69b9b6
Compare
brooksprumo
reviewed
Jan 24, 2023
brooksprumo
approved these changes
Jan 24, 2023
| let deserialized_bank = snapshot_utils::bank_from_snapshot_archives( | ||
| &[accounts_dir.path().to_path_buf()], | ||
| &[accounts_dir.as_path().to_path_buf()], |
There was a problem hiding this comment.
Looks like this accounts_dir could be used directly:
Suggested change
| &[accounts_dir.as_path().to_path_buf()], | |
| &[accounts_dir], |
To not block this PR, can you address this in a subsequent PR?
There was a problem hiding this comment.
Sounds good. I will do this in a subsequent PR. Thanks!
apfitzge
approved these changes
Jan 24, 2023
| .map(|temp_dir| { | ||
| create_accounts_run_and_snapshot_dirs(temp_dir).map(|(run_dir, _snapshot_dir)| run_dir) | ||
| }) | ||
| .collect(); |
There was a problem hiding this comment.
Interesting, I wasn't aware you could collect into a result like this! Neat!
|
@xiangzhu70 This is causing OOM on master. |
xiangzhu70
added a commit
to xiangzhu70/solana
that referenced
this pull request
Jan 25, 2023
This PR is causing OOM on master. Reverting it for now. This reverts commit 74f89d1.
xiangzhu70
added a commit
that referenced
this pull request
Jan 25, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Problem
To allow hardlinking accounts files into snapshot directories (PR 29496), the first step is to generate run/ and snapshot directories for all the user provided account_paths.
This is a split of the PRs #29496 and #28745
Summary of Changes
Add the setup_accounts_run_and_snapshot_paths function;
Add the generate_test_tmp_account_path function to be used for the tests;
Many other small changes to call the setup function to initialize the account paths.
Fixes #