filip/Stalwart
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Meilisearch: Return HTTP status error when creating indexes (fixes #2574)

Browse Source
This commit is contained in:
mdecimus
2025-12-29 15:05:32 +01:00
parent 5e9d78567d
commit 239d093f72
2 changed files with 37 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
crates/store/src/backend/meili/main.rs
View File

@@ -31,21 +31,31 @@ impl MeiliSearchStore {
.property_or_default::<Duration>((&prefix, "task.poll-interval"), "500ms") .property_or_default::<Duration>((&prefix, "task.poll-interval"), "500ms")
.unwrap_or(Duration::from_millis(500)); .unwrap_or(Duration::from_millis(500));
let task_poll_retries = config let task_poll_retries = config
.property_or_default::<usize>((&prefix, "task.poll-retries"), "60") .property_or_default::<usize>((&prefix, "task.poll-retries"), "120")
.unwrap_or(60); .unwrap_or(120);
let task_fail_on_timeout = config
.property_or_default::<bool>((&prefix, "task.fail-on-timeout"), "true")
.unwrap_or(true);
let ms = Self { let ms = Self {
client, client,
url, url,
task_poll_interval, task_poll_interval: Duration::from_millis(500),
task_poll_retries, task_poll_retries: 120,
task_fail_on_timeout: true,
}; };
if let Err(err) = ms.create_indexes().await { if let Err(err) = ms.create_indexes().await {
config.new_build_error(prefix.as_str(), err.to_string()); config.new_build_error(prefix.as_str(), err.to_string());
} }
Some(ms) Some(Self {
client: ms.client,
url: ms.url,
task_poll_interval,
task_poll_retries,
task_fail_on_timeout,
})
} }
pub async fn create_indexes(&self) -> trc::Result<()> { pub async fn create_indexes(&self) -> trc::Result<()> {
@@ -58,19 +68,20 @@ impl MeiliSearchStore {
async fn create_index<T: SearchableField>(&self) -> trc::Result<()> { async fn create_index<T: SearchableField>(&self) -> trc::Result<()> {
let index_name = T::index().index_name(); let index_name = T::index().index_name();
let response = self let response = assert_success(
.client self.client
.post(format!("{}/indexes", self.url)) .post(format!("{}/indexes", self.url))
.body( .body(
json!({ json!({
"uid": index_name, "uid": index_name,
"primaryKey": "id", "primaryKey": "id",
}) })
.to_string(), .to_string(),
) )
.send() .send()
.await .await,
.map_err(|err| trc::StoreEvent::MeilisearchError.reason(err))?; )
.await?;
if !self.wait_for_task(response).await? { if !self.wait_for_task(response).await? {
// Index already exists // Index already exists
@@ -245,9 +256,13 @@ impl MeiliSearchStore {
} }
} }
Err(trc::StoreEvent::MeilisearchError if self.task_fail_on_timeout {
.reason("Timed out waiting for Meilisearch task") Err(trc::StoreEvent::MeilisearchError
.id(task_uid)) .reason("Timed out waiting for Meilisearch task")
.id(task_uid))
} else {
Ok(true)
}
} }
} }

1
crates/store/src/backend/meili/mod.rs
View File

@@ -16,6 +16,7 @@ pub struct MeiliSearchStore {
url: String, url: String,
task_poll_interval: Duration, task_poll_interval: Duration,
task_poll_retries: usize, task_poll_retries: usize,
task_fail_on_timeout: bool,
} }
#[derive(Debug, Deserialize)] #[derive(Debug, Deserialize)]