From 33c6c4f0eed2d7e8038ce54ac564e83ceb75c561 Mon Sep 17 00:00:00 2001
From: Marin Postma <postma.marin@protonmail.com>
Date: Sun, 30 May 2021 15:55:17 +0200
Subject: [PATCH] add timestamos to dump info

---
 meilisearch-http/src/index/updates.rs                     | 5 +++--
 meilisearch-http/src/index_controller/dump_actor/actor.rs | 4 +++-
 meilisearch-http/src/index_controller/dump_actor/mod.rs   | 8 ++++++++
 .../src/index_controller/update_actor/store/dump.rs       | 3 ---
 .../src/index_controller/update_actor/store/mod.rs        | 2 +-
 5 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/meilisearch-http/src/index/updates.rs b/meilisearch-http/src/index/updates.rs
index 053ca6a60..566356d5f 100644
--- a/meilisearch-http/src/index/updates.rs
+++ b/meilisearch-http/src/index/updates.rs
@@ -197,9 +197,10 @@ impl Index {
         builder.update_format(format);
         builder.index_documents_method(method);
 
-        let indexing_callback =
-            |indexing_step, update_id| info!("update {}: {:?}", update_id, indexing_step);
+        //let indexing_callback =
+            //|indexing_step, update_id| info!("update {}: {:?}", update_id, indexing_step);
 
+        let indexing_callback = |_, _| ();
 
         let gzipped = false;
         let addition = match content {
diff --git a/meilisearch-http/src/index_controller/dump_actor/actor.rs b/meilisearch-http/src/index_controller/dump_actor/actor.rs
index b93d6f42d..ff4c39f6d 100644
--- a/meilisearch-http/src/index_controller/dump_actor/actor.rs
+++ b/meilisearch-http/src/index_controller/dump_actor/actor.rs
@@ -97,7 +97,9 @@ where
             return;
         }
         let uid = generate_uid();
+
         let info = DumpInfo::new(uid.clone(), DumpStatus::InProgress);
+
         *self.dump_info.write().await = Some(info.clone());
 
         ret.send(Ok(info)).expect("Dump actor is dead");
@@ -126,7 +128,7 @@ where
             }
             Err(_) => {
                 error!("Dump panicked. Dump status set to failed");
-                *dump_info.write().await = Some(DumpInfo::new(uid, DumpStatus::Failed));
+                (*dump_info.write().await).as_mut().expect("Inconsistent dump service state").with_error("Unexpected error while performing dump.".to_string());
             }
         };
     }
diff --git a/meilisearch-http/src/index_controller/dump_actor/mod.rs b/meilisearch-http/src/index_controller/dump_actor/mod.rs
index 2b7d8a3e0..b236122bd 100644
--- a/meilisearch-http/src/index_controller/dump_actor/mod.rs
+++ b/meilisearch-http/src/index_controller/dump_actor/mod.rs
@@ -1,6 +1,7 @@
 use std::fs::File;
 use std::path::{Path, PathBuf};
 
+use chrono::{DateTime, Utc};
 use log::{error, info};
 #[cfg(test)]
 use mockall::automock;
@@ -86,6 +87,9 @@ pub struct DumpInfo {
     pub status: DumpStatus,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub error: Option<String>,
+    started_at: DateTime<Utc>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    finished_at: Option<DateTime<Utc>>,
 }
 
 impl DumpInfo {
@@ -94,15 +98,19 @@ impl DumpInfo {
             uid,
             status,
             error: None,
+            started_at: Utc::now(),
+            finished_at: None,
         }
     }
 
     pub fn with_error(&mut self, error: String) {
         self.status = DumpStatus::Failed;
+        self.finished_at = Some(Utc::now());
         self.error = Some(error);
     }
 
     pub fn done(&mut self) {
+        self.finished_at = Some(Utc::now());
         self.status = DumpStatus::Done;
     }
 
diff --git a/meilisearch-http/src/index_controller/update_actor/store/dump.rs b/meilisearch-http/src/index_controller/update_actor/store/dump.rs
index fb4b7d5ac..fad8974f3 100644
--- a/meilisearch-http/src/index_controller/update_actor/store/dump.rs
+++ b/meilisearch-http/src/index_controller/update_actor/store/dump.rs
@@ -5,7 +5,6 @@ use std::{
     path::{Path, PathBuf},
 };
 
-use anyhow::Context;
 use heed::{EnvOpenOptions, RoTxn};
 use serde::{Deserialize, Serialize};
 use uuid::Uuid;
@@ -84,8 +83,6 @@ impl UpdateStore {
                     std::fs::copy(src, dst)?;
                 }
 
-                println!("copied files");
-
                 let update_json = UpdateEntry {
                     uuid,
                     update: update.into(),
diff --git a/meilisearch-http/src/index_controller/update_actor/store/mod.rs b/meilisearch-http/src/index_controller/update_actor/store/mod.rs
index 6e8f87a79..29ccd4f34 100644
--- a/meilisearch-http/src/index_controller/update_actor/store/mod.rs
+++ b/meilisearch-http/src/index_controller/update_actor/store/mod.rs
@@ -168,7 +168,7 @@ impl UpdateStore {
                             match res {
                                 Ok(Some(_)) => (),
                                 Ok(None) => break,
-                                Err(e) => panic!("error while processing update: {}", e),
+                                Err(e) => error!("error while processing update: {}", e),
                             }
                         }
                         // the ownership on the arc has been taken, we need to exit.