snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2024-11-30 00:55:00 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

use a RwLock instead of a Mutex

Browse Source
This commit is contained in:
tamo 2021-05-24 18:19:34 +02:00
parent 912f0286b3
commit 49a0e8aa19
No known key found for this signature in database
GPG Key ID: 20CD8020AFA88D69
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
meilisearch-http/src/index_controller/dump_actor/actor.rs
View File

@ -10,7 +10,7 @@ use std::{
path::{Path, PathBuf}, path::{Path, PathBuf},
sync::Arc, sync::Arc,
}; };
use tokio::sync::{mpsc, oneshot, Mutex}; use tokio::sync::{mpsc, oneshot, RwLock};
use uuid::Uuid; use uuid::Uuid;
pub const CONCURRENT_DUMP_MSG: usize = 10; pub const CONCURRENT_DUMP_MSG: usize = 10;
@ -21,7 +21,7 @@ pub struct DumpActor<UuidResolver, Index, Update> {
index: Index, index: Index,
update: Update, update: Update,
dump_path: PathBuf, dump_path: PathBuf,
dump_info: Arc<Mutex<Option<DumpInfo>>>, dump_info: Arc<RwLock<Option<DumpInfo>>>,
} }
/// Generate uid from creation date /// Generate uid from creation date
@ -48,7 +48,7 @@ where
index, index,
update, update,
dump_path: dump_path.as_ref().into(), dump_path: dump_path.as_ref().into(),
dump_info: Arc::new(Mutex::new(None)), dump_info: Arc::new(RwLock::new(None)),
} }
} }
@ -97,7 +97,7 @@ where
} }
let uid = generate_uid(); let uid = generate_uid();
let info = DumpInfo::new(uid.clone(), DumpStatus::InProgress); let info = DumpInfo::new(uid.clone(), DumpStatus::InProgress);
*self.dump_info.lock().await = Some(info.clone()); *self.dump_info.write().await = Some(info.clone());
ret.send(Ok(info)).expect("Dump actor is dead"); ret.send(Ok(info)).expect("Dump actor is dead");
@ -114,7 +114,7 @@ where
match task_result { match task_result {
Ok(Ok(())) => { Ok(Ok(())) => {
if let Some(ref mut info) = *dump_info.lock().await { if let Some(ref mut info) = *dump_info.write().await {
info.done(); info.done();
} else { } else {
warn!("dump actor was in an inconsistant state"); warn!("dump actor was in an inconsistant state");
@ -122,7 +122,7 @@ where
info!("Dump succeed"); info!("Dump succeed");
} }
Ok(Err(e)) => { Ok(Err(e)) => {
if let Some(ref mut info) = *dump_info.lock().await { if let Some(ref mut info) = *dump_info.write().await {
info.with_error(e.to_string()); info.with_error(e.to_string());
} else { } else {
warn!("dump actor was in an inconsistant state"); warn!("dump actor was in an inconsistant state");
@ -131,13 +131,13 @@ where
} }
Err(_) => { Err(_) => {
error!("Dump panicked. Dump status set to failed"); error!("Dump panicked. Dump status set to failed");
*dump_info.lock().await = Some(DumpInfo::new(uid, DumpStatus::Failed)); *dump_info.write().await = Some(DumpInfo::new(uid, DumpStatus::Failed));
} }
}; };
} }
async fn handle_dump_info(&self, uid: String) -> DumpResult<DumpInfo> { async fn handle_dump_info(&self, uid: String) -> DumpResult<DumpInfo> {
match &*self.dump_info.lock().await { match &*self.dump_info.read().await {
None => self.dump_from_fs(uid).await, None => self.dump_from_fs(uid).await,
Some(DumpInfo { uid: ref s, .. }) if &uid != s => self.dump_from_fs(uid).await, Some(DumpInfo { uid: ref s, .. }) if &uid != s => self.dump_from_fs(uid).await,
Some(info) => Ok(info.clone()), Some(info) => Ok(info.clone()),
@ -154,7 +154,7 @@ where
async fn is_running(&self) -> bool { async fn is_running(&self) -> bool {
matches!( matches!(
*self.dump_info.lock().await, *self.dump_info.read().await,
Some(DumpInfo { Some(DumpInfo {
status: DumpStatus::InProgress, status: DumpStatus::InProgress,
.. ..