Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions magicblock-task-scheduler/src/service.rs
Original file line number Diff line number Diff line change
Expand Up @@ -221,9 +221,7 @@ impl TaskSchedulerService {
return Ok(());
}

self.remove_task_from_queue(cancel_request.task_id);

// Remove task from database
// Remove task from queue and database
self.unregister_task(cancel_request.task_id).await?;

Ok(())
Expand Down Expand Up @@ -278,17 +276,21 @@ impl TaskSchedulerService {
}

self.db.insert_task(&task).await?;
self.task_queue
self.remove_task_from_queue(task.id);
let key = self
.task_queue
.insert(task.clone(), Duration::from_millis(0));
self.task_queue_keys.insert(task.id, key);
debug!("Registered task {} from context", task.id);

Ok(())
}

pub async fn unregister_task(
&self,
&mut self,
task_id: i64,
) -> TaskSchedulerResult<()> {
self.remove_task_from_queue(task_id);
self.db.remove_task(task_id).await?;
debug!("Removed task {} from database", task_id);

Expand Down