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

Prevent multiple test-validators from using the same ledger directory

Browse Source
This commit is contained in:
Michael Vines
2020-12-15 10:52:22 -08:00
committed by mergify[bot]
parent d2af09a647
commit f3272db7f7
3 changed files with 33 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
validator/src/bin/solana-test-validator.rs
View File

@ -188,19 +188,28 @@ fn main() {
}
}
if !ledger_path.exists() {
fs::create_dir(&ledger_path).unwrap_or_else(|err| {
eprintln!(
"Error: Unable to create directory {}: {}",
ledger_path.display(),
err
);
exit(1);
})
}
let mut ledger_fd_lock = fd_lock::FdLock::new(std::fs::File::open(&ledger_path).unwrap());
let _ledger_lock = ledger_fd_lock.try_lock().unwrap_or_else(|_| {
eprintln!(
"Error: Unable to lock {} directory. Check if another solana-test-validator is running",
ledger_path.display()
);
exit(1);
});
let validator_log_symlink = ledger_path.join("validator.log");
let logfile = if output != Output::Log {
if !ledger_path.exists() {
fs::create_dir(&ledger_path).unwrap_or_else(|err| {
eprintln!(
"Error: Unable to create directory {}: {}",
ledger_path.display(),
err
);
exit(1);
})
}
let validator_log_with_timestamp = format!(
"validator-{}.log",
SystemTime::now()