diff options
| author | Alex Auvolat <alex@adnab.me> | 2021-03-18 19:27:02 +0100 |
|---|---|---|
| committer | Alex Auvolat <alex@adnab.me> | 2021-03-18 19:27:02 +0100 |
| commit | 4348bde180887f5185ca6da6024476e8e8fb2fe6 (patch) | |
| tree | 8a35f0e4229d15665af7673eebcaa1b3d75a73cb /src/rpc/rpc_client.rs | |
| parent | 5b659b28ce6bef15072d2fc93f777aa8ff73b2d8 (diff) | |
| parent | 4eb16e886388f35d2bdee52b16922421004cf132 (diff) | |
| download | garage-4348bde180887f5185ca6da6024476e8e8fb2fe6.tar.gz garage-4348bde180887f5185ca6da6024476e8e8fb2fe6.zip | |
Merge branch 'dev-0.2'
Diffstat (limited to 'src/rpc/rpc_client.rs')
| -rw-r--r-- | src/rpc/rpc_client.rs | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/rpc/rpc_client.rs b/src/rpc/rpc_client.rs index 70384391..eb4f6620 100644 --- a/src/rpc/rpc_client.rs +++ b/src/rpc/rpc_client.rs @@ -7,7 +7,6 @@ use std::sync::Arc; use std::time::Duration; use arc_swap::ArcSwapOption; -use bytes::IntoBuf; use futures::future::Future; use futures::stream::futures_unordered::FuturesUnordered; use futures::stream::StreamExt; @@ -197,11 +196,8 @@ impl<M: RpcMessage + 'static> RpcClient<M> { if !strategy.rs_interrupt_after_quorum { let wait_finished_fut = tokio::spawn(async move { resp_stream.collect::<Vec<_>>().await; - Ok(()) }); - self.background.spawn(wait_finished_fut.map(|x| { - x.unwrap_or_else(|e| Err(Error::Message(format!("Await failed: {}", e)))) - })); + self.background.spawn(wait_finished_fut.map(|_| Ok(()))); } Ok(results) @@ -336,7 +332,7 @@ impl RpcHttpClient { let body = hyper::body::to_bytes(resp.into_body()).await?; drop(slot); - match rmp_serde::decode::from_read::<_, Result<M, String>>(body.into_buf())? { + match rmp_serde::decode::from_read::<_, Result<M, String>>(&body[..])? { Err(e) => Ok(Err(Error::RemoteError(e, status))), Ok(x) => Ok(Ok(x)), } |