Flush buffer after forming archive #76
Conversation
src/report.rs
Outdated
| @@ -227,6 +228,7 @@ pub fn report(report: &Report) -> Result<()> { | |||
| let enc = GzEncoder::new(tar_gz, Compression::default()); | |||
| let mut tar = tar::Builder::new(enc); | |||
| tar.append_dir_all(&report_name, &report_name)?; | |||
| tar.into_inner()?.flush()?; | |||
There was a problem hiding this comment.
This is unnecessary, tar is going out of scope at the end of this function and so will be flushed as part of that destruction.
There was a problem hiding this comment.
Yeah. Was being extra careful so that if, in the future, somebody did something after this, we won't be bit. I've removed it now.
src/report.rs
Outdated
| @@ -47,6 +47,7 @@ pub fn form_and_copy_archive(loc: String, report_name: &PathBuf) -> Result<()> { | |||
| let enc = GzEncoder::new(tar_gz, Compression::default()); | |||
| let mut tar = tar::Builder::new(enc); | |||
| tar.append_dir_all(&dir_stem, &loc)?; | |||
| tar.into_inner()?.flush()?; | |||
There was a problem hiding this comment.
Put this in a block so tar gets destroyed now that writing of the tar file is complete. Even this flush isn't 100% safe as you're flushing the GzEncoder, but there could conceivably still be tar-related data to write (stuff written when the tar stream is closed).
There was a problem hiding this comment.
Changed to being in a block.
src/lib.rs
Outdated
| @@ -209,6 +210,7 @@ impl PerformanceData { | |||
| let enc = GzEncoder::new(tar_gz, Compression::default()); | |||
| let mut tar = tar::Builder::new(enc); | |||
| tar.append_dir_all(&dir_name, &self.init_params.dir_name)?; | |||
| tar.into_inner()?.flush()?; | |||
There was a problem hiding this comment.
tar is going out of scope before the output file could be used, so this is unnecessary
Data remains in the GzEncoder. Ensure it is flushed before performing any other operations on the tarball. This fixes a bug in the report generation, where the tarball of the raw data is copied to data/archive/. When trying to untar the file, the data is corrupted and unuseable.
Data remains in the GzEncoder. Ensure it is flushed before performing any other operations on the tarball.
This fixes a bug in the report generation, where the tarball of the raw data is copied to data/archive/. When trying to untar the file, the data is corrupted and un-useable.
By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.
aperf_report_works.tar.gz
aperf_report_worksnt.tar.gz