-
Notifications
You must be signed in to change notification settings - Fork 85
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feat(raiko): put the tasks that cannot run in parallel into pending list #358
Open
smtmfft
wants to merge
4
commits into
main
Choose a base branch
from
pending-task-list
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+71
−22
Open
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,7 @@ | ||
use std::{collections::HashMap, sync::Arc}; | ||
use std::{ | ||
collections::{HashMap, VecDeque}, | ||
sync::Arc, | ||
}; | ||
|
||
use raiko_core::{ | ||
interfaces::{ProofRequest, RaikoError}, | ||
|
@@ -13,10 +16,13 @@ use raiko_lib::{ | |
use raiko_tasks::{get_task_manager, TaskDescriptor, TaskManager, TaskManagerWrapper, TaskStatus}; | ||
use tokio::{ | ||
select, | ||
sync::{mpsc::Receiver, Mutex, OwnedSemaphorePermit, Semaphore}, | ||
sync::{ | ||
mpsc::{Receiver, Sender}, | ||
Mutex, | ||
}, | ||
}; | ||
use tokio_util::sync::CancellationToken; | ||
use tracing::{error, info, warn}; | ||
use tracing::{debug, error, info, warn}; | ||
|
||
use crate::{ | ||
cache, | ||
|
@@ -32,26 +38,36 @@ use crate::{ | |
pub struct ProofActor { | ||
opts: Opts, | ||
chain_specs: SupportedChainSpecs, | ||
tasks: Arc<Mutex<HashMap<TaskDescriptor, CancellationToken>>>, | ||
running_tasks: Arc<Mutex<HashMap<TaskDescriptor, CancellationToken>>>, | ||
pending_tasks: Arc<Mutex<VecDeque<ProofRequest>>>, | ||
receiver: Receiver<Message>, | ||
sender: Sender<Message>, | ||
} | ||
|
||
impl ProofActor { | ||
pub fn new(receiver: Receiver<Message>, opts: Opts, chain_specs: SupportedChainSpecs) -> Self { | ||
let tasks = Arc::new(Mutex::new( | ||
pub fn new( | ||
sender: Sender<Message>, | ||
receiver: Receiver<Message>, | ||
opts: Opts, | ||
chain_specs: SupportedChainSpecs, | ||
) -> Self { | ||
let running_tasks = Arc::new(Mutex::new( | ||
HashMap::<TaskDescriptor, CancellationToken>::new(), | ||
)); | ||
let pending_tasks = Arc::new(Mutex::new(VecDeque::<ProofRequest>::new())); | ||
|
||
Self { | ||
tasks, | ||
opts, | ||
chain_specs, | ||
running_tasks, | ||
pending_tasks, | ||
receiver, | ||
sender, | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. In Rust, we usually use rx and tx to replace receiver and sender. |
||
} | ||
} | ||
|
||
pub async fn cancel_task(&mut self, key: TaskDescriptor) -> HostResult<()> { | ||
let tasks_map = self.tasks.lock().await; | ||
let tasks_map = self.running_tasks.lock().await; | ||
let Some(task) = tasks_map.get(&key) else { | ||
warn!("No task with those keys to cancel"); | ||
return Ok(()); | ||
|
@@ -76,7 +92,7 @@ impl ProofActor { | |
Ok(()) | ||
} | ||
|
||
pub async fn run_task(&mut self, proof_request: ProofRequest, _permit: OwnedSemaphorePermit) { | ||
pub async fn run_task(&mut self, proof_request: ProofRequest) { | ||
let cancel_token = CancellationToken::new(); | ||
|
||
let Ok((chain_id, blockhash)) = get_task_data( | ||
|
@@ -97,10 +113,11 @@ impl ProofActor { | |
proof_request.prover.clone().to_string(), | ||
)); | ||
|
||
let mut tasks = self.tasks.lock().await; | ||
let mut tasks = self.running_tasks.lock().await; | ||
tasks.insert(key.clone(), cancel_token.clone()); | ||
let sender = self.sender.clone(); | ||
|
||
let tasks = self.tasks.clone(); | ||
let tasks = self.running_tasks.clone(); | ||
let opts = self.opts.clone(); | ||
let chain_specs = self.chain_specs.clone(); | ||
|
||
|
@@ -109,7 +126,7 @@ impl ProofActor { | |
_ = cancel_token.cancelled() => { | ||
info!("Task cancelled"); | ||
} | ||
result = Self::handle_message(proof_request, key.clone(), &opts, &chain_specs) => { | ||
result = Self::handle_message(proof_request.clone(), key.clone(), &opts, &chain_specs) => { | ||
match result { | ||
Ok(()) => { | ||
info!("Host handling message"); | ||
|
@@ -122,25 +139,56 @@ impl ProofActor { | |
} | ||
let mut tasks = tasks.lock().await; | ||
tasks.remove(&key); | ||
// notify complete task to let next pending task run | ||
sender | ||
.send(Message::TaskComplete(proof_request)) | ||
.await | ||
.expect("Couldn't send message"); | ||
}); | ||
} | ||
|
||
pub async fn run(&mut self) { | ||
let semaphore = Arc::new(Semaphore::new(self.opts.concurrency_limit)); | ||
|
||
// recv() is protected by outside mpsc, no lock needed here | ||
while let Some(message) = self.receiver.recv().await { | ||
match message { | ||
Message::Cancel(key) => { | ||
debug!("Message::Cancel task: {:?}", key); | ||
if let Err(error) = self.cancel_task(key).await { | ||
error!("Failed to cancel task: {error}") | ||
} | ||
} | ||
Message::Task(proof_request) => { | ||
let permit = Arc::clone(&semaphore) | ||
.acquire_owned() | ||
.await | ||
.expect("Couldn't acquire permit"); | ||
self.run_task(proof_request, permit).await; | ||
debug!("Message::Task proof_request: {:?}", proof_request); | ||
let running_task_count = self.running_tasks.lock().await.len(); | ||
if running_task_count < self.opts.concurrency_limit { | ||
info!("Running task {:?}", proof_request); | ||
self.run_task(proof_request).await; | ||
} else { | ||
info!( | ||
"Task concurrency limit reached, current running {:?}, pending: {:?}", | ||
running_task_count, | ||
self.pending_tasks.lock().await.len() | ||
); | ||
let mut pending_tasks = self.pending_tasks.lock().await; | ||
pending_tasks.push_back(proof_request); | ||
} | ||
} | ||
Message::TaskComplete(req) => { | ||
// pop up pending task if any task complete | ||
debug!("Message::TaskComplete: {:?}", req); | ||
info!( | ||
"task completed, current running {:?}, pending: {:?}", | ||
self.running_tasks.lock().await.len(), | ||
self.pending_tasks.lock().await.len() | ||
); | ||
let mut pending_tasks = self.pending_tasks.lock().await; | ||
if let Some(proof_request) = pending_tasks.pop_front() { | ||
info!("Pop out pending task {:?}", proof_request); | ||
self.sender | ||
.send(Message::Task(proof_request)) | ||
.await | ||
.expect("Couldn't send message"); | ||
} | ||
} | ||
} | ||
} | ||
|
@@ -189,7 +237,7 @@ pub async fn handle_proof( | |
store: Option<&mut TaskManagerWrapper>, | ||
) -> HostResult<Proof> { | ||
info!( | ||
"# Generating proof for block {} on {}", | ||
"Generating proof for block {} on {}", | ||
proof_request.block_number, proof_request.network | ||
); | ||
|
||
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We can use oneshot channel to notify the watcher the result of tasks
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
you mean notify one-shot channel & let it send task in??