Skip to content
Merged
Show file tree
Hide file tree
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
44 changes: 19 additions & 25 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions crates/fluxqueue-worker/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,6 @@ anyhow = "1.0.100"
pythonize = "0.27.0"
chrono = "0.4.43"
num_cpus = "1.17.0"
futures = "0.3.32"

fluxqueue-common.workspace = true
41 changes: 30 additions & 11 deletions crates/fluxqueue-worker/src/worker.rs
Original file line number Diff line number Diff line change
Expand Up @@ -50,20 +50,39 @@ pub async fn run_worker(
let executor_ids = generate_executor_ids(concurrency);
let mut executors = JoinSet::new();

for i in 0..concurrency {
let redis_client = Arc::clone(&redis_client);
let queue_name = Arc::clone(&queue_name);
let executor_id = Arc::clone(&executor_ids[i]);
let shutdown = shutdown.clone();
let task_registry = Arc::clone(&task_registry);
let python_dispatcher = Arc::new(PythonDispatcher::new()?);
let executor_futures: Vec<_> = (0..concurrency)
.map(|i| {
let redis_client = Arc::clone(&redis_client);
let queue_name = Arc::clone(&queue_name);
let executor_id = Arc::clone(&executor_ids[i]);
let shutdown = shutdown.clone();
let task_registry = Arc::clone(&task_registry);

redis_client
.register_executor(&queue_name, &executor_id)
.await?;
async move {
let python_dispatcher = Arc::new(PythonDispatcher::new()?);

redis_client.set_executor_heartbeat(&executor_id).await?;
redis_client
.register_executor(&queue_name, &executor_id)
.await?;

redis_client.set_executor_heartbeat(&executor_id).await?;

Ok::<_, anyhow::Error>((
shutdown,
queue_name,
executor_id,
redis_client,
task_registry,
python_dispatcher,
))
}
})
.collect();

let results = futures::future::join_all(executor_futures).await;
for result in results {
let (shutdown, queue_name, executor_id, redis_client, task_registry, python_dispatcher) =
result?;
executors.spawn(executor_loop(
shutdown,
queue_name,
Expand Down