Merge pull request #1050 from input-output-hk/ensemble/1023/flaky_e2e_ci

Fix snapshot download flaky end-to-end tests
input-output-hk · Jul 11, 2023 · 3ad37c0 · 3ad37c0
2 parents 6a8511b + da54c0f
commit 3ad37c0
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 8 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/mithril-client/Cargo.toml b/mithril-client/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "mithril-client"
-version = "0.3.17"
+version = "0.3.18"
 description = "A Mithril Client"
 authors = { workspace = true }
 edition = { workspace = true }
@@ -17,7 +17,7 @@ clap = { version = "4.0", features = ["derive", "env"] }
 cli-table = "0.4"
 config = "0.13.1"
 directories = "5.0.1"
-flate2 = "1.0.23"
+flate2 = "1.0.26"
 fs2 = "0.4.3"
 futures = "0.3"
 hex = "0.4.3"

diff --git a/mithril-client/src/aggregator_client/snapshot_client.rs b/mithril-client/src/aggregator_client/snapshot_client.rs
@@ -67,7 +67,7 @@ impl SnapshotClient {
     ) -> StdResult<PathBuf> {
         let filepath = PathBuf::new()
             .join(download_dir)
-            .join(format!("snapshot-{}", snapshot.digest));
+            .join(format!("snapshot-{}.tar.gz", snapshot.digest));
 
         for url in snapshot.locations.as_slice() {
             if self.http_client.probe(url).await.is_ok() {

diff --git a/mithril-client/src/services/snapshot.rs b/mithril-client/src/services/snapshot.rs
@@ -500,7 +500,11 @@ mod tests {
 
         let (_, verifier) = setup_genesis();
         let genesis_verification_key = verifier.to_verification_key();
-        build_dummy_snapshot("digest-10", "1234567890".repeat(124).as_str(), &test_path);
+        build_dummy_snapshot(
+            "digest-10.tar.gz",
+            "1234567890".repeat(124).as_str(),
+            &test_path,
+        );
         let filepath = snapshot_service
             .download(
                 &snapshot,
@@ -551,7 +555,11 @@ mod tests {
 
         let (_, verifier) = setup_genesis();
         let genesis_verification_key = verifier.to_verification_key();
-        build_dummy_snapshot("digest-10", "1234567890".repeat(124).as_str(), &test_path);
+        build_dummy_snapshot(
+            "digest-10.tar.gz",
+            "1234567890".repeat(124).as_str(),
+            &test_path,
+        );
         let err = snapshot_service
             .download(
                 &signed_entity,
@@ -577,7 +585,7 @@ mod tests {
                 "Expected a SnapshotServiceError when snapshot can not be verified. Got {err:?}: '{err}'"
             );
         }
-        let filepath = test_path.join("snapshot-digest-10");
+        let filepath = test_path.join("snapshot-digest-10.tar.gz");
         assert!(filepath.exists());
         let unpack_dir = filepath
             .parent()

diff --git a/mithril-client/src/utils/unpacker.rs b/mithril-client/src/utils/unpacker.rs
@@ -1,5 +1,6 @@
 use std::{
     fs::{create_dir_all, remove_dir, File},
+    io::{Seek, SeekFrom},
     path::{Path, PathBuf},
 };
 
@@ -90,12 +91,16 @@ impl SnapshotUnpacker {
 
     /// Unpack the snapshot pointed at the given filepath into the given directory.
     pub async fn unpack_snapshot(&self, filepath: &Path, unpack_dir: &Path) -> StdResult<()> {
-        let snapshot_file_tar_gz =
+        let mut snapshot_file_tar_gz =
             File::open(filepath).map_err(|e| SnapshotUnpackerError::UnpackFailed {
                 filepath: filepath.to_owned(),
                 dirpath: unpack_dir.to_owned(),
                 error: e.into(),
             })?;
+        // Try to force the file read to start at 0.
+        // This seems to fix a crash when the unpacker tries to iterate
+        // over archive content.
+        snapshot_file_tar_gz.seek(SeekFrom::Start(0))?;
         let snapshot_file_tar = GzDecoder::new(snapshot_file_tar_gz);
         let mut snapshot_archive = Archive::new(snapshot_file_tar);
         snapshot_archive