From 3d5075015952499720b865f076138fc2b995bf1a Mon Sep 17 00:00:00 2001 From: DimAn Date: Wed, 17 Mar 2021 15:11:24 +0300 Subject: [PATCH] Revert to removing only tmp- (cherry picked from commit a5d144b00f2d86673ca67190bef602269aa6a1a4) --- runtime/src/snapshot_utils.rs | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/runtime/src/snapshot_utils.rs b/runtime/src/snapshot_utils.rs index 20aa2369ec3c77..8dc25c62617cae 100644 --- a/runtime/src/snapshot_utils.rs +++ b/runtime/src/snapshot_utils.rs @@ -44,7 +44,6 @@ const MAX_SNAPSHOT_DATA_FILE_SIZE: u64 = 32 * 1024 * 1024 * 1024; // 32 GiB const VERSION_STRING_V1_2_0: &str = "1.2.0"; const DEFAULT_SNAPSHOT_VERSION: SnapshotVersion = SnapshotVersion::V1_2_0; const TMP_SNAPSHOT_PREFIX: &str = "tmp-snapshot-"; -const TMP_SNAPSHOT_EXTENSION: &str = ".tmp"; // when downloading #[derive(Copy, Clone, Eq, PartialEq, Debug)] pub enum SnapshotVersion { @@ -207,12 +206,11 @@ fn get_archive_ext(archive_format: ArchiveFormat) -> &'static str { pub fn remove_tmp_snapshot_archives(snapshot_path: &Path) { if let Ok(entries) = fs::read_dir(&snapshot_path) { for entry in entries.filter_map(|entry| entry.ok()) { - let filename = entry + if entry .file_name() .into_string() - .unwrap_or_else(|_| String::new()); - if filename.starts_with(TMP_SNAPSHOT_PREFIX) - | filename.ends_with(TMP_SNAPSHOT_EXTENSION) + .unwrap_or_else(|_| String::new()) + .starts_with(TMP_SNAPSHOT_PREFIX) { if entry.path().is_file() { fs::remove_file(entry.path())