searchengines-web/MeiliSearch
searchengines-web/MeiliSearch
1
0
Fork 0
mirror of https://github.com/meilisearch/MeiliSearch synced 2025-07-03 03:47:02 +02:00
Code Issues Releases Wiki Activity

Let the tick function set the Failed status itself

Browse source
This commit is contained in:
Kerollmops 2022-10-05 16:48:43 +02:00 • committed by Clément Renault
parent 566c15fb74
commit b24b13b036
No known key found for this signature in database
GPG key ID: 92ADA4E935E71FA4
2 changed files with 25 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

60
index-scheduler/src/batch.rs
View file

@ -496,20 +496,16 @@ impl IndexScheduler {
) -> Result<Vec<Task>> {
match operation {
IndexOperation::DocumentClear { mut tasks, .. } => {
let result = milli::update::ClearDocuments::new(index_wtxn, index).execute();
let count = milli::update::ClearDocuments::new(index_wtxn, index).execute()?;
for task in &mut tasks {
match result {
Ok(deleted_documents) => {
task.status = Status::Succeeded;
task.details = Some(Details::ClearAll {
deleted_documents: Some(deleted_documents),
});
}
Err(ref error) => {
task.status = Status::Failed;
task.error = Some(MilliError(error).into())
}
}
task.status = Status::Succeeded;
task.details = match &task.kind {
KindWithContent::DocumentClear { .. } => Some(Details::ClearAll {
deleted_documents: Some(count),
}),
otherwise => otherwise.default_details(),
};
}
Ok(tasks)
@ -608,24 +604,16 @@ impl IndexScheduler {
builder.delete_external_id(id);
});
let result = builder.execute();
let DocumentDeletionResult {
deleted_documents, ..
} = builder.execute()?;
for (task, documents) in tasks.iter_mut().zip(documents) {
match result {
Ok(DocumentDeletionResult {
deleted_documents,
remaining_documents: _,
}) => {
task.status = Status::Succeeded;
task.details = Some(Details::DocumentDeletion {
received_document_ids: documents.len(),
deleted_documents: Some(deleted_documents),
});
}
Err(ref error) => {
task.status = Status::Failed;
task.error = Some(MilliError(error).into());
}
}
task.status = Status::Succeeded;
task.details = Some(Details::DocumentDeletion {
received_document_ids: documents.len(),
deleted_documents: Some(deleted_documents),
});
}
Ok(tasks)
@ -644,17 +632,11 @@ impl IndexScheduler {
let mut builder =
milli::update::Settings::new(index_wtxn, index, indexer_config);
apply_settings_to_builder(&checked_settings, &mut builder);
let result = builder.execute(|indexing_step| {
builder.execute(|indexing_step| {
debug!("update: {:?}", indexing_step);
});
})?;
match result {
Ok(_) => task.status = Status::Succeeded,
Err(ref error) => {
task.status = Status::Failed;
task.error = Some(MilliError(error).into());
}
}
task.status = Status::Succeeded;
}
Ok(tasks)