From d7c077cffbbd046ba70b5d7f71954aebaa0f73ff Mon Sep 17 00:00:00 2001
From: mpostma <postma.marin@protonmail.com>
Date: Thu, 25 Mar 2021 14:48:51 +0100
Subject: [PATCH] atomic snapshot import

---
 .../src/index_controller/snapshot.rs           | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/meilisearch-http/src/index_controller/snapshot.rs b/meilisearch-http/src/index_controller/snapshot.rs
index 57bfd0940..b494d2481 100644
--- a/meilisearch-http/src/index_controller/snapshot.rs
+++ b/meilisearch-http/src/index_controller/snapshot.rs
@@ -3,9 +3,9 @@ use std::time::Duration;
 
 use anyhow::bail;
 use log::{error, info};
+use tokio::fs;
 use tokio::task::spawn_blocking;
 use tokio::time::sleep;
-use tokio::fs;
 
 use super::update_actor::UpdateActorHandle;
 use super::uuid_resolver::UuidResolverHandle;
@@ -59,7 +59,8 @@ where
 
         let snapshot_dir = self.snapshot_path.clone();
         fs::create_dir_all(&snapshot_dir).await?;
-        let temp_snapshot_dir = spawn_blocking(move || tempfile::tempdir_in(snapshot_dir)).await??;
+        let temp_snapshot_dir =
+            spawn_blocking(move || tempfile::tempdir_in(snapshot_dir)).await??;
         let temp_snapshot_path = temp_snapshot_dir.path().to_owned();
 
         let uuids = self
@@ -82,7 +83,9 @@ where
         futures::future::try_join_all(tasks).await?;
 
         let snapshot_dir = self.snapshot_path.clone();
-        let snapshot_path = self.snapshot_path.join(format!("{}.snapshot", self.db_name));
+        let snapshot_path = self
+            .snapshot_path
+            .join(format!("{}.snapshot", self.db_name));
         let snapshot_path = spawn_blocking(move || -> anyhow::Result<PathBuf> {
             let temp_snapshot_file = tempfile::NamedTempFile::new_in(snapshot_dir)?;
             let temp_snapshot_file_path = temp_snapshot_file.path().to_owned();
@@ -105,7 +108,14 @@ pub fn load_snapshot(
     ignore_missing_snapshot: bool,
 ) -> anyhow::Result<()> {
     if !db_path.as_ref().exists() && snapshot_path.as_ref().exists() {
-        compression::from_tar_gz(snapshot_path, db_path)
+        match compression::from_tar_gz(snapshot_path, &db_path) {
+            Ok(()) => Ok(()),
+            Err(e) => {
+                // clean created db folder
+                std::fs::remove_dir_all(&db_path)?;
+                Err(e)
+            }
+        }
     } else if db_path.as_ref().exists() && !ignore_snapshot_if_db_exists {
         bail!(
             "database already exists at {:?}, try to delete it or rename it",