gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Consistently create temp dirs under ledger/farf (#10848)

Browse Source
This commit is contained in:
Ryo Onodera
2020-07-01 11:38:59 +09:00
committed by GitHub
parent 5adf6f6bde
commit b89e506cbb
5 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
local-cluster/src/local_cluster.rs
View File

@ -173,6 +173,7 @@ impl LocalCluster {
leader_node.info.rpc.port(),
leader_node.info.rpc_pubsub.port(),
));
leader_config.account_paths = vec![leader_ledger_path.join("accounts")];
let leader_server = Validator::new(
leader_node,
&leader_keypair,
@ -300,6 +301,7 @@ impl LocalCluster {
validator_node.info.rpc_pubsub.port(),
));
let voting_keypair = Arc::new(voting_keypair);
config.account_paths = vec![ledger_path.join("accounts")];
let validator_server = Validator::new(
validator_node,
&validator_keypair,
@ -558,7 +560,8 @@ impl Cluster for LocalCluster {
// Restart the node
let validator_info = &cluster_validator_info.info;
cluster_validator_info.config.account_paths =
vec![validator_info.ledger_path.join("accounts")];
let restarted_node = Validator::new(
node,
&validator_info.keypair,

12
local-cluster/tests/local_cluster.rs
View File

@ -1182,9 +1182,15 @@ fn wait_for_next_snapshot(
}
}
fn farf_dir() -> PathBuf {
std::env::var("FARF_DIR")
.unwrap_or_else(|_| "farf".to_string())
.into()
}
fn generate_account_paths(num_account_paths: usize) -> (Vec<TempDir>, Vec<PathBuf>) {
let account_storage_dirs: Vec<TempDir> = (0..num_account_paths)
.map(|_| TempDir::new().unwrap())
.map(|_| tempfile::tempdir_in(farf_dir()).unwrap())
.collect();
let account_storage_paths: Vec<_> = account_storage_dirs
.iter()
@ -1205,8 +1211,8 @@ fn setup_snapshot_validator_config(
num_account_paths: usize,
) -> SnapshotValidatorConfig {
// Create the snapshot config
let snapshot_dir = TempDir::new().unwrap();
let snapshot_output_path = TempDir::new().unwrap();
let snapshot_dir = tempfile::tempdir_in(farf_dir()).unwrap();
let snapshot_output_path = tempfile::tempdir_in(farf_dir()).unwrap();
let snapshot_config = SnapshotConfig {
snapshot_interval_slots,
snapshot_package_output_path: PathBuf::from(snapshot_output_path.path()),