searchengines-web/MeiliSearch
searchengines-web/MeiliSearch
1
0
Fork 0
mirror of https://github.com/meilisearch/MeiliSearch synced 2025-01-30 23:27:36 +01:00
Code Issues Releases Wiki Activity

make sure the batches we snapshots actually all contains an enqueued_at

Browse Source
This commit is contained in:
Tamo 2025-01-28 11:51:07 +01:00
parent 485e3127c7
commit e0f0da57e2
No known key found for this signature in database
GPG Key ID: 20CD8020AFA88D69
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
crates/index-scheduler/src/insta_snapshot.rs
View File

@ -345,10 +345,10 @@ pub fn snapshot_batch(batch: &Batch) -> String {
if let Some(finished_at) = finished_at { if let Some(finished_at) = finished_at {
assert!(finished_at > started_at); assert!(finished_at > started_at);
} }
if let Some(BatchEnqueuedAt { earliest, oldest }) = enqueued_at { let BatchEnqueuedAt { earliest, oldest } = enqueued_at.unwrap();
assert!(started_at > earliest); assert!(*started_at > earliest);
assert!(earliest >= oldest); assert!(earliest >= oldest);
}
snap.push('{'); snap.push('{');
snap.push_str(&format!("uid: {uid}, ")); snap.push_str(&format!("uid: {uid}, "));
snap.push_str(&format!("details: {}, ", serde_json::to_string(details).unwrap())); snap.push_str(&format!("details: {}, ", serde_json::to_string(details).unwrap()));

17
crates/index-scheduler/src/utils.rs
View File

@ -359,14 +359,27 @@ impl crate::IndexScheduler {
kind, kind,
} = task; } = task;
assert_eq!(uid, task.uid); assert_eq!(uid, task.uid);
if let Some(ref batch) = batch_uid { if task.status != Status::Enqueued {
let batch_uid = batch_uid.expect("All non enqueued tasks must be part of a batch");
assert!(self assert!(self
.queue .queue
.batch_to_tasks_mapping .batch_to_tasks_mapping
.get(&rtxn, batch) .get(&rtxn, &batch_uid)
.unwrap() .unwrap()
.unwrap() .unwrap()
.contains(uid)); .contains(uid));
let batch = self.queue.batches.get_batch(&rtxn, batch_uid).unwrap().unwrap();
assert_eq!(batch.uid, batch_uid);
if task.status == Status::Processing {
assert!(batch.progress.is_some());
} else {
assert!(batch.progress.is_none());
}
assert_eq!(batch.started_at, task.started_at.unwrap());
assert_eq!(batch.finished_at, task.finished_at);
let enqueued_at = batch.enqueued_at.unwrap();
assert!(task.enqueued_at >= enqueued_at.oldest);
assert!(task.enqueued_at <= enqueued_at.earliest);
} }
if let Some(task_index_uid) = &task_index_uid { if let Some(task_index_uid) = &task_index_uid {
assert!(self assert!(self