Skip to content

Remove unsupported archive formats when archiving #6321

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
brooksprumo merged 1 commit into from
May 27, 2025
Merged

Remove unsupported archive formats when archiving #6321

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 2 additions & 16 deletions runtime/src/snapshot_utils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1085,7 +1085,7 @@ fn archive_snapshot(
));

{
let mut archive_file = fs::File::create(&staging_archive_path)
let archive_file = fs::File::create(&staging_archive_path)
.map_err(|err| E::CreateArchiveFile(err, staging_archive_path.clone()))?;

let do_archive_files = |encoder: &mut dyn Write| -> std::result::Result<(), E> {
Expand Down Expand Up @@ -1133,18 +1133,6 @@ fn archive_snapshot(
};

match archive_format {
ArchiveFormat::TarBzip2 => {
let mut encoder =
bzip2::write::BzEncoder::new(archive_file, bzip2::Compression::best());
do_archive_files(&mut encoder)?;
encoder.finish().map_err(E::FinishEncoder)?;
}
ArchiveFormat::TarGzip => {
let mut encoder =
flate2::write::GzEncoder::new(archive_file, flate2::Compression::default());
do_archive_files(&mut encoder)?;
encoder.finish().map_err(E::FinishEncoder)?;
}
ArchiveFormat::TarZstd { config } => {
let mut encoder =
zstd::stream::Encoder::new(archive_file, config.compression_level)
Expand All @@ -1161,9 +1149,7 @@ fn archive_snapshot(
let (_output, result) = encoder.finish();
result.map_err(E::FinishEncoder)?;
}
ArchiveFormat::Tar => {
do_archive_files(&mut archive_file)?;
}
_ => panic!("archiving snapshot with '{archive_format}' is not supported"),
};
}

Expand Down
Loading