searchengines-web/MeiliSearch
searchengines-web/MeiliSearch
1
0
Fork 0
mirror of https://github.com/meilisearch/MeiliSearch synced 2024-11-26 14:54:27 +01:00
Code Issues Releases Wiki Activity

Log the error instead of returning it when deletion fails

Browse Source
This commit is contained in:
many 2021-10-07 17:36:54 +02:00
parent 0774b1efa5
commit a92a0c3ed3
No known key found for this signature in database
GPG Key ID: 2CEF23B75189EACA
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
meilisearch-lib/src/index_controller/index_resolver/mod.rs
View File

@ -6,6 +6,7 @@ use std::path::Path;
use error::{IndexResolverError, Result}; use error::{IndexResolverError, Result};
use index_store::{IndexStore, MapIndexStore}; use index_store::{IndexStore, MapIndexStore};
use log::error;
use uuid::Uuid; use uuid::Uuid;
use uuid_store::{HeedUuidStore, UuidStore}; use uuid_store::{HeedUuidStore, UuidStore};
@ -100,9 +101,13 @@ where
let index = self.index_store.create(uuid, primary_key).await?; let index = self.index_store.create(uuid, primary_key).await?;
match self.index_uuid_store.insert(uid, uuid).await { match self.index_uuid_store.insert(uid, uuid).await {
Err(e) => { Err(e) => {
if let Some(index) = self.index_store.delete(uuid).await? { match self.index_store.delete(uuid).await {
Ok(Some(index)) => {
index.inner().clone().prepare_for_closing(); index.inner().clone().prepare_for_closing();
} }
Ok(None) => (),
Err(e) => error!("Error while deleting index: {:?}", e),
}
Err(e) Err(e)
} }
Ok(()) => Ok(index), Ok(()) => Ok(index),
@ -128,9 +133,13 @@ where
pub async fn delete_index(&self, uid: String) -> Result<Uuid> { pub async fn delete_index(&self, uid: String) -> Result<Uuid> {
match self.index_uuid_store.delete(uid.clone()).await? { match self.index_uuid_store.delete(uid.clone()).await? {
Some(uuid) => { Some(uuid) => {
if let Some(index) = self.index_store.delete(uuid).await? { match self.index_store.delete(uuid).await {
Ok(Some(index)) => {
index.inner().clone().prepare_for_closing(); index.inner().clone().prepare_for_closing();
} }
Ok(None) => (),
Err(e) => error!("Error while deleting index: {:?}", e),
}
Ok(uuid) Ok(uuid)
} }
None => Err(IndexResolverError::UnexistingIndex(uid)), None => Err(IndexResolverError::UnexistingIndex(uid)),