From 1b682a8f08c733d09fd3c8a428bb92298faf39b8 Mon Sep 17 00:00:00 2001 From: Mike Zeller Date: Tue, 5 Aug 2025 16:34:01 -0400 Subject: [PATCH 1/2] [jj-spr] initial version Created using jj-spr 1.3.6-beta.1 --- sled-diagnostics/src/logs.rs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/sled-diagnostics/src/logs.rs b/sled-diagnostics/src/logs.rs index 73b16203488..16912984f6b 100644 --- a/sled-diagnostics/src/logs.rs +++ b/sled-diagnostics/src/logs.rs @@ -720,7 +720,13 @@ fn write_log_to_zip( zip_path, FullFileOptions::default() .compression_method(zip::CompressionMethod::Zstd) - .compression_level(Some(3)), + .compression_level(Some(3)) + // NB: From the docs + // If set to false and the file exceeds the + // limit, an I/O error is thrown and the file is aborted. If set to + // true, readers will require ZIP64 support and if the file does not + // exceed the limit, 20 B are wasted. + .large_file(true), )?; if let Err(e) = std::io::copy(&mut src, zip) { // If we fail here the `ZipWriter` is an unknown state and we are forced From df99f099f9c3cfa8c854347733097e00a3eaf1aa Mon Sep 17 00:00:00 2001 From: Mike Zeller Date: Tue, 5 Aug 2025 16:34:01 -0400 Subject: [PATCH 2/2] also enable large file in the nexus task Created using jj-spr 1.3.6-beta.1 --- nexus/src/app/background/tasks/support_bundle_collector.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nexus/src/app/background/tasks/support_bundle_collector.rs b/nexus/src/app/background/tasks/support_bundle_collector.rs index 69cad6240f7..f6d508323ca 100644 --- a/nexus/src/app/background/tasks/support_bundle_collector.rs +++ b/nexus/src/app/background/tasks/support_bundle_collector.rs @@ -1153,7 +1153,7 @@ fn recursively_add_directory_to_zipfile( let file_type = entry.file_type()?; if file_type.is_file() { - let opts = FullFileOptions::default(); + let opts = FullFileOptions::default().large_file(true); let src = entry.path(); zip.start_file_from_path(dst, opts)?;