snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2025-09-06 04:36:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix race condition: take the rtxn before entering the thread so we're sure we won't try to retrieve deleted tasks

Browse Source
This commit is contained in:
Tamo
2025-08-05 16:47:35 +02:00
parent 2b5b41790e
commit 3f1e172c6f
2 changed files with 40 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
crates/index-scheduler/src/lib.rs
View File

@ -784,7 +784,7 @@ impl IndexScheduler {
} }
/// Once the tasks changes have been committed we must send all the tasks that were updated to our webhooks /// Once the tasks changes have been committed we must send all the tasks that were updated to our webhooks
fn notify_webhooks(&self, webhooks: Webhooks, updated: &RoaringBitmap) -> Result<()> { fn notify_webhooks(&self, updated: RoaringBitmap) {
struct TaskReader<'a, 'b> { struct TaskReader<'a, 'b> {
rtxn: &'a RoTxn<'a>, rtxn: &'a RoTxn<'a>,
index_scheduler: &'a IndexScheduler, index_scheduler: &'a IndexScheduler,
@ -829,13 +829,27 @@ impl IndexScheduler {
} }
} }
let rtxn = self.env.read_txn()?; let webhooks = self.webhooks();
if webhooks.webhooks.is_empty() {
return;
}
let this = self.private_clone();
// We must take the RoTxn before entering the thread::spawn otherwise another batch may be
// processed before we had the time to take our txn.
let rtxn = match self.env.clone().static_read_txn() {
Ok(rtxn) => rtxn,
Err(e) => {
tracing::error!("Couldn't get an rtxn to notify the webhook: {e}");
return;
}
};
std::thread::spawn(move || {
for (uuid, Webhook { url, headers }) in webhooks.webhooks.iter() { for (uuid, Webhook { url, headers }) in webhooks.webhooks.iter() {
let task_reader = TaskReader { let task_reader = TaskReader {
rtxn: &rtxn, rtxn: &rtxn,
index_scheduler: self, index_scheduler: &this,
tasks: &mut updated.into_iter(), tasks: &mut updated.iter(),
buffer: Vec::with_capacity(page_size::get()), buffer: Vec::with_capacity(page_size::get()),
written: 0, written: 0,
}; };
@ -854,8 +868,7 @@ impl IndexScheduler {
tracing::error!("While sending data to the webhook {uuid}: {e}"); tracing::error!("While sending data to the webhook {uuid}: {e}");
} }
} }
});
Ok(())
} }
pub fn index_stats(&self, index_uid: &str) -> Result<IndexStats> { pub fn index_stats(&self, index_uid: &str) -> Result<IndexStats> {

11
crates/index-scheduler/src/scheduler/mod.rs
View File

@ -446,16 +446,7 @@ impl IndexScheduler {
Ok(()) Ok(())
})?; })?;
// We shouldn't crash the tick function if we can't send data to the webhooks self.notify_webhooks(ids);
let webhooks = self.webhooks();
if !webhooks.webhooks.is_empty() {
let cloned_index_scheduler = self.private_clone();
std::thread::spawn(move || {
if let Err(e) = cloned_index_scheduler.notify_webhooks(webhooks, &ids) {
tracing::error!("Failure to notify webhooks: {e}");
}
});
}
#[cfg(test)] #[cfg(test)]
self.breakpoint(crate::test_utils::Breakpoint::AfterProcessing); self.breakpoint(crate::test_utils::Breakpoint::AfterProcessing);