From 231a027c7d93d286bd6541c12e5d7520979463b3 Mon Sep 17 00:00:00 2001 From: Louis Dureuil Date: Tue, 15 Apr 2025 14:58:32 +0200 Subject: [PATCH] Use TaskKindCannotBeBatched for task deletion, upgrade database and snapshot creation --- .../src/scheduler/create_batch.rs | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/crates/index-scheduler/src/scheduler/create_batch.rs b/crates/index-scheduler/src/scheduler/create_batch.rs index 56be5b76e..29d352fe8 100644 --- a/crates/index-scheduler/src/scheduler/create_batch.rs +++ b/crates/index-scheduler/src/scheduler/create_batch.rs @@ -454,10 +454,8 @@ impl IndexScheduler { current_batch.uid = batch_uid; } current_batch.processing(&mut tasks); - current_batch.reason(BatchStopReason::TaskCannotBeBatched { - kind: Kind::UpgradeDatabase, - id: tasks.first().unwrap().uid, - }); + current_batch + .reason(BatchStopReason::TaskKindCannotBeBatched { kind: Kind::UpgradeDatabase }); return Ok(Some((Batch::UpgradeDatabase { tasks }, current_batch))); } @@ -479,10 +477,8 @@ impl IndexScheduler { if !to_delete.is_empty() { let mut tasks = self.queue.tasks.get_existing_tasks(rtxn, to_delete)?; current_batch.processing(&mut tasks); - current_batch.reason(BatchStopReason::TaskCannotBeBatched { - kind: Kind::TaskDeletion, - id: tasks.first().unwrap().uid, - }); + current_batch + .reason(BatchStopReason::TaskKindCannotBeBatched { kind: Kind::TaskDeletion }); return Ok(Some((Batch::TaskDeletions(tasks), current_batch))); } @@ -491,10 +487,8 @@ impl IndexScheduler { if !to_snapshot.is_empty() { let mut tasks = self.queue.tasks.get_existing_tasks(rtxn, to_snapshot)?; current_batch.processing(&mut tasks); - current_batch.reason(BatchStopReason::TaskCannotBeBatched { - kind: Kind::SnapshotCreation, - id: tasks.first().unwrap().uid, - }); + current_batch + .reason(BatchStopReason::TaskKindCannotBeBatched { kind: Kind::SnapshotCreation }); return Ok(Some((Batch::SnapshotCreation(tasks), current_batch))); }