snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2025-07-27 00:31:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix a deadlock

Browse Source
This commit is contained in:
Tamo
2022-09-26 22:26:30 +02:00
committed by Clément Renault
parent 22bfb5a7a0
commit 0ba1c46e19
2 changed files with 52 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
index-scheduler/src/batch.rs
View File

@ -427,7 +427,7 @@ impl IndexScheduler {
Ok(None)
}
pub(crate) fn process_batch(&self, wtxn: &mut RwTxn, batch: Batch) -> Result<Vec<Task>> {
pub(crate) fn process_batch(&self, batch: Batch) -> Result<Vec<Task>> {
match batch {
Batch::Cancel(_) => todo!(),
Batch::Snapshot(_) => todo!(),
@ -439,7 +439,12 @@ impl IndexScheduler {
content_files,
mut tasks,
} => {
let index = self.index_mapper.create_index(wtxn, &index_uid)?;
// we NEED a write transaction for the index creation.
// To avoid blocking the whole process we're going to commit asap.
let mut wtxn = self.env.write_txn()?;
let index = self.index_mapper.create_index(&mut wtxn, &index_uid)?;
wtxn.commit()?;
let ret = index.update_documents(
IndexDocumentsMethod::ReplaceDocuments,
primary_key,
@ -474,7 +479,9 @@ impl IndexScheduler {
settings: _,
settings_tasks: _,
} => {
let index = self.index_mapper.create_index(wtxn, &index_uid)?;
let mut wtxn = self.env.write_txn()?;
let index = self.index_mapper.create_index(&mut wtxn, &index_uid)?;
wtxn.commit()?;
let mut updated_tasks = Vec::new();
/*