blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Untar is called for shred archives that do not exist. (#9565) 

automerge
This commit is contained in:
anatoly yakovenko 2020-04-18 08:34:55 -07:00 committed by GitHub
parent addbdcb660
commit 729cb5eec6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ledger/src/blockstore.rs
View File

@ -344,7 +344,7 @@ impl Blockstore {
} }
fn tar_dir(dir: String, archive: String) -> Result<()> { fn tar_dir(dir: String, archive: String) -> Result<()> {
let args = ["cfz", &archive, &dir]; let args = ["cfzP", &archive, &dir];
let output = std::process::Command::new("tar").args(&args).output()?; let output = std::process::Command::new("tar").args(&args).output()?;
if !output.status.success() { if !output.status.success() {
warn!( warn!(
@ -1263,10 +1263,11 @@ impl Blockstore {
let f = fs::File::open(path); let f = fs::File::open(path);
if f.is_err() { if f.is_err() {
if let Some(archive) = tgz { if let Some(archive) = tgz {
Self::extract_data(archive, shred_path) if Path::new(archive).is_file() {
} else { return Self::extract_data(archive, shred_path);
Ok(None) }
} }
Ok(None)
} else { } else {
let mut buf = vec![]; let mut buf = vec![];
f?.read_to_end(&mut buf)?; f?.read_to_end(&mut buf)?;