snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2024-12-02 18:15:38 +08:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Merge pull request #241 from meilisearch/fix-dead-locks

Browse Source 
Fix dead locks
This commit is contained in:
Clément Renault 2019-10-28 18:20:01 +01:00 committed by GitHub
commit af96050944
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
meilidb-core/src/database.rs
View File

@ -35,10 +35,13 @@ fn update_awaiter(receiver: Receiver<()>, env: heed::Env, update_fn: Arc<ArcSwap
match update::update_task(&mut writer, index.clone()) { match update::update_task(&mut writer, index.clone()) {
Ok(Some(status)) => { Ok(Some(status)) => {
if status.result.is_ok() { match status.result {
if let Err(e) = writer.commit() { Ok(_) => {
error!("update transaction failed: {}", e) if let Err(e) = writer.commit() {
error!("update transaction failed: {}", e)
}
} }
Err(_) => writer.abort(),
} }
if let Some(ref callback) = *update_fn.load() { if let Some(ref callback) = *update_fn.load() {

1
meilidb-core/src/store/mod.rs
View File

@ -167,6 +167,7 @@ impl Index {
} }
pub fn clear_all(&self, writer: &mut heed::RwTxn) -> MResult<u64> { pub fn clear_all(&self, writer: &mut heed::RwTxn) -> MResult<u64> {
let _ = self.updates_notifier.send(());
update::push_clear_all(writer, self.updates, self.updates_results) update::push_clear_all(writer, self.updates, self.updates_results)
} }