web search done right
fixed case where mapreduce worker panic did not register as failure at manager if 0 is a valid answer to the job
Mikkel Denker22f74e2d9ddb
diff --git a/examples/mapreduce_manager.rs b/examples/mapreduce_manager.rsindex 35000b3b..86885731 100644--- a/examples/mapreduce_manager.rs+++ b/examples/mapreduce_manager.rs@@ -7,7 +7,7 @@ use tracing_subscriber::FmtSubscriber;#[derive(Serialize, Deserialize, Debug)]struct Job {- contents: Vec<usize>,+ id: usize,}#[derive(Serialize, Deserialize, Debug)]@@ -16,7 +16,7 @@ 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- Count(self.contents.into_iter().filter(|d| *d == 0).count())+ Count(1)}}@@ -34,24 +34,12 @@ async fn main() {tracing::subscriber::set_global_default(subscriber).unwrap();let jobs = vec![- Job {- contents: vec![1, 2, 0, 1, 0, 1, 0],- },- Job {- contents: vec![3, 2, 1],- },- Job {- contents: vec![0, 0],- },- Job {- contents: vec![1, 2, 0, 1, 0, 1, 0],- },- Job {- contents: vec![3, 2, 1],- },- Job {- contents: vec![0, 0],- },+ Job { id: 0 },+ Job { id: 1 },+ Job { id: 2 },+ Job { id: 3 },+ Job { id: 4 },+ Job { id: 5 },];let res = jobsdiff --git a/examples/mapreduce_worker.rs b/examples/mapreduce_worker.rsindex 5cbda5fa..ca153f9d 100644--- a/examples/mapreduce_worker.rs+++ b/examples/mapreduce_worker.rs@@ -7,7 +7,7 @@ use tracing_subscriber::FmtSubscriber;#[derive(Serialize, Deserialize, Debug)]struct Job {- contents: Vec<usize>,+ id: usize,}#[derive(Serialize, Deserialize, Debug)]@@ -16,7 +16,7 @@ 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- Count(self.contents.into_iter().filter(|d| *d == 0).count())+ Count(1)}}diff --git a/src/mapreduce/manager.rs b/src/mapreduce/manager.rsindex a15b0943..1ffc4de3 100644--- a/src/mapreduce/manager.rs+++ b/src/mapreduce/manager.rs@@ -55,6 +55,9 @@ impl RemoteWorker {loop {if let Ok(size) = stream.read(&mut buf).await {debug!("read {:?} bytes", size);+ if size == 0 && bytes.len() == 0 {+ return Err(Error::NoResponse);+ }bytes.extend_from_slice(&buf);if size < buf.len() {break;@@ -91,6 +94,10 @@ impl<'a> WorkerGuard<'a> {from_pool: pool,}}++ fn success(self) {+ self.from_pool.insert(Arc::clone(&self.worker))+ }}impl<'a> Deref for WorkerGuard<'a> {@@ -103,7 +110,7 @@ impl<'a> Deref for WorkerGuard<'a> {impl<'a> Drop for WorkerGuard<'a> {fn drop(&mut self) {- self.from_pool.put_back(Arc::clone(&self.worker))+ self.from_pool.put_back()}}@@ -142,12 +149,15 @@ impl WorkerPool {}}- fn put_back(&self, worker: Arc<RemoteWorker>) {+ fn put_back(&self) {+ self.running_workers.fetch_sub(1, Ordering::SeqCst);+ }++ fn insert(&self, worker: Arc<RemoteWorker>) {let ch = self.alive_workers.0.clone();tokio::spawn(async move {ch.send(worker).await.unwrap();});- self.running_workers.fetch_sub(1, Ordering::SeqCst);}async fn get_worker<'a>(&'a self) -> Result<WorkerGuard<'a>> {@@ -202,7 +212,10 @@ impl Manager {O: Reduce<O> + Send,{let worker = self.pool.get_worker().await?;- worker.perform(job).await+ let res = worker.perform(job).await?;+ worker.success();++ Ok(res)}/// Execute job on one of the remote machines. If the remote machine fails for some reason,@@ -217,7 +230,7 @@ impl Manager {Ok(res) => return res,Err(Error::NoAvailableWorker) => panic!("{}", Error::NoAvailableWorker),Err(_) => {- debug!("rescheduling job");+ debug!("got err - rescheduling job");}}}diff --git a/src/mapreduce/mod.rs b/src/mapreduce/mod.rsindex b093d617..d2b06fd4 100644--- a/src/mapreduce/mod.rs+++ b/src/mapreduce/mod.rs@@ -36,14 +36,14 @@ pub enum Error {#[error("error while serializing/deserializing to/from bytes")]Serialization(#[from] bincode::Error),- #[error("failed to stop some of the workers")]- StopWorker,-#[error("could not get a working worker")]NoAvailableWorker,#[error("failed to get value from channel")]ChannelRecv(#[from] async_channel::RecvError),++ #[error("did not get a reponse")]+ NoResponse,}pub trait Map<T>@@ -76,7 +76,7 @@ whereimpl<I, O, T> MapReduce<I, O> for TwhereT: Iterator<Item = I> + Sized,- I: Map<O> + Send + Sync,+ I: Map<O> + Sync,O: Reduce<O> + Send,{}diff --git a/src/mapreduce/worker.rs b/src/mapreduce/worker.rsindex cae84b28..f89c2364 100644--- a/src/mapreduce/worker.rs+++ b/src/mapreduce/worker.rs@@ -1,7 +1,6 @@use std::net::SocketAddr;-use super::Result;-use super::{Map, Task};+use super::{Error, Map, Result, Task};use serde::{de::DeserializeOwned, Serialize};use tokio::io::AsyncReadExt;use tokio::io::{AsyncRead, AsyncWrite, AsyncWriteExt};@@ -27,6 +26,9 @@ impl Worker {loop {if let Ok(size) = stream.read(&mut buf).await {debug!("read {:?} bytes", size);+ if size == 0 && bytes.len() == 0 {+ return Err(Error::NoResponse);+ }bytes.extend_from_slice(&buf);if size < buf.len() {break;