From e36247d187cb8730a0d4a10524c599fb16b2d228 Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Fri, 2 Jul 2021 12:29:13 -0700
Subject: [PATCH] As a last resort try to download an uncompressed snapshot

`solana-test-validator` creates uncompressed snapshots and it can be
useful to attach another validator to a `solana-test-validator` cluster
from time to time
---
 download-utils/src/lib.rs | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/download-utils/src/lib.rs b/download-utils/src/lib.rs
index b92cb9c2c..565f7d733 100644
--- a/download-utils/src/lib.rs
+++ b/download-utils/src/lib.rs
@@ -258,6 +258,7 @@ pub fn download_snapshot<'a, 'b>(
         ArchiveFormat::TarZstd,
         ArchiveFormat::TarGzip,
         ArchiveFormat::TarBzip2,
+        ArchiveFormat::Tar, // `solana-test-validator` creates uncompressed snapshots
     ] {
         let desired_snapshot_package = snapshot_utils::build_snapshot_archive_path(
             snapshot_output_dir.to_path_buf(),
@@ -270,7 +271,7 @@ pub fn download_snapshot<'a, 'b>(
             return Ok(());
         }
 
-        if download_file(
+        match download_file(
             &format!(
                 "http://{}/{}",
                 rpc_addr,
@@ -283,11 +284,13 @@ pub fn download_snapshot<'a, 'b>(
             &desired_snapshot_package,
             use_progress_bar,
             progress_notify_callback,
-        )
-        .is_ok()
-        {
-            return Ok(());
+        ) {
+            Ok(()) => return Ok(()),
+            Err(err) => info!("{}", err),
         }
     }
-    Err("Snapshot couldn't be downloaded".to_string())
+    Err(format!(
+        "Failed to download a snapshot for slot {} from {}",
+        desired_snapshot_hash.0, rpc_addr
+    ))
 }