Skip to content

web search done right

mapreduce success async

Mikkel Denker1c067a24433f
diff --git a/examples/mapreduce_manager.rs b/examples/mapreduce_manager.rs
index 86885731..b1fe363d 100644
--- a/examples/mapreduce_manager.rs
+++ b/examples/mapreduce_manager.rs
@@ -10,9 +10,6 @@ struct Job {
id: usize,
}
-#[derive(Serialize, Deserialize, Debug)]
-struct Count(usize);
-
impl Map<Count> for Job {
fn map(self) -> Count {
std::thread::sleep(std::time::Duration::from_secs(2)); // simulate some long running task
@@ -20,6 +17,9 @@ impl Map<Count> for Job {
}
}
+#[derive(Serialize, Deserialize, Debug)]
+struct Count(usize);
+
impl Reduce for Count {
fn reduce(self, element: Self) -> Self {
Count(self.0 + element.0)
diff --git a/src/mapreduce/manager.rs b/src/mapreduce/manager.rs
index 1ffc4de3..134a8e45 100644
--- a/src/mapreduce/manager.rs
+++ b/src/mapreduce/manager.rs
@@ -95,8 +95,8 @@ impl<'a> WorkerGuard<'a> {
}
}
- fn success(self) {
- self.from_pool.insert(Arc::clone(&self.worker))
+ async fn success(self) {
+ self.from_pool.insert(Arc::clone(&self.worker)).await
}
}
@@ -153,11 +153,9 @@ impl WorkerPool {
self.running_workers.fetch_sub(1, Ordering::SeqCst);
}
- fn insert(&self, worker: Arc<RemoteWorker>) {
+ async fn insert(&self, worker: Arc<RemoteWorker>) {
let ch = self.alive_workers.0.clone();
- tokio::spawn(async move {
- ch.send(worker).await.unwrap();
- });
+ ch.send(worker).await.unwrap();
}
async fn get_worker<'a>(&'a self) -> Result<WorkerGuard<'a>> {
@@ -213,7 +211,7 @@ impl Manager {
{
let worker = self.pool.get_worker().await?;
let res = worker.perform(job).await?;
- worker.success();
+ worker.success().await;
Ok(res)
}