web search done right
make sure active connections aren't reused from connection pool.
Mikkel Denkerb2dd6c87310f
diff --git a/crates/core/src/distributed/sonic/connection_pool.rs b/crates/core/src/distributed/sonic/connection_pool.rsindex db8b871d..440b009a 100644--- a/crates/core/src/distributed/sonic/connection_pool.rs+++ b/crates/core/src/distributed/sonic/connection_pool.rs@@ -112,7 +112,11 @@ whereobj: &mut Self::Type,_: &managed::Metrics,) -> managed::RecycleResult<Self::Error> {- if obj.is_closed().await {+ if obj.awaiting_response() {+ Err(managed::RecycleError::Message(+ "Connection is awaiting response".into(),+ ))+ } else if obj.is_closed().await {Err(managed::RecycleError::Message("Connection is closed".into(),))@@ -163,7 +167,11 @@ whereobj: &mut Self::Type,_: &managed::Metrics,) -> managed::RecycleResult<Self::Error> {- if obj.is_closed().await {+ if obj.awaiting_response() {+ Err(managed::RecycleError::Message(+ "Connection is awaiting response".into(),+ ))+ } else if obj.is_closed().await {Err(managed::RecycleError::Message("Connection is closed".into(),))diff --git a/crates/core/src/distributed/sonic/mod.rs b/crates/core/src/distributed/sonic/mod.rsindex 2da7f02b..bfe63b15 100644--- a/crates/core/src/distributed/sonic/mod.rs+++ b/crates/core/src/distributed/sonic/mod.rs@@ -60,6 +60,7 @@ pub struct Connection<Req, Res> {stream: TcpStream,created: std::time::Instant,marker: PhantomData<(Req, Res)>,+ awaiting_res: bool,}impl<Req, Res> Connection<Req, Res>@@ -86,6 +87,7 @@ whereOk(Connection {stream,+ awaiting_res: false,created: std::time::Instant::now(),marker: PhantomData,})@@ -118,6 +120,7 @@ where}async fn send_without_timeout(&mut self, request: &Req) -> Result<Res> {+ self.awaiting_res = true;let bytes = bincode::encode_to_vec(request, bincode::config::standard()).unwrap();let header = Header {@@ -146,6 +149,8 @@ wheretracing::debug!("deserializing {:?}", std::any::type_name::<(Req, Res)>());let (res, _) = bincode::decode_from_slice(&buf, bincode::config::standard()).unwrap();+ self.awaiting_res = false;+Ok(res)}@@ -164,6 +169,10 @@ where}}+ pub fn awaiting_response(&self) -> bool {+ self.awaiting_res+ }+pub async fn is_closed(&mut self) -> bool {if self.created.elapsed() > MAX_CONNECTION_TTL {self.stream.shutdown().await.ok();diff --git a/crates/core/src/distributed/sonic/service.rs b/crates/core/src/distributed/sonic/service.rsindex 2376c424..b7d3e3a4 100644--- a/crates/core/src/distributed/sonic/service.rs+++ b/crates/core/src/distributed/sonic/service.rs@@ -87,12 +87,14 @@ impl<S: Service> Server<S> {}pub struct Connection<S: Service> {+ await_res: bool,inner: super::Connection<OneOrMany<S::Request>, OneOrMany<S::Response>>,}impl<S: Service> Connection<S> {pub async fn create(server: impl ToSocketAddrs) -> Result<Connection<S>> {Ok(Connection {+ await_res: false,inner: super::Connection::create(server).await?,})}@@ -102,6 +104,7 @@ impl<S: Service> Connection<S> {timeout: Duration,) -> Result<Connection<S>> {Ok(Connection {+ await_res: false,inner: super::Connection::create_with_timeout(server, timeout).await?,})}@@ -112,30 +115,37 @@ impl<S: Service> Connection<S> {retry: impl Iterator<Item = Duration>,) -> Result<Connection<S>> {Ok(Connection {+ await_res: false,inner: super::Connection::create_with_timeout_retry(server, timeout, retry).await?,})}pub async fn send_without_timeout<R: Wrapper<S>>(&mut self, request: R) -> Result<R::Response> {- Ok(R::unwrap_response(+ self.await_res = true;+ let res = Ok(R::unwrap_response(self.inner.send_without_timeout(&OneOrMany::One(R::wrap_request(request))).await?.one().expect("response is missing"),)- .unwrap())+ .unwrap());+ self.await_res = false;+ res}pub async fn send<R: Wrapper<S>>(&mut self, request: R) -> Result<R::Response> {- Ok(R::unwrap_response(+ self.await_res = true;+ let res = Ok(R::unwrap_response(self.inner.send(&OneOrMany::One(R::wrap_request(request))).await?.one().expect("response is missing"),)- .unwrap())+ .unwrap());+ self.await_res = false;+ res}pub async fn send_with_timeout<R: Wrapper<S>>(@@ -143,14 +153,17 @@ impl<S: Service> Connection<S> {request: R,timeout: Duration,) -> Result<R::Response> {- Ok(R::unwrap_response(+ self.await_res = true;+ let res = Ok(R::unwrap_response(self.inner.send_with_timeout(&OneOrMany::One(R::wrap_request(request)), timeout).await?.one().expect("response is missing"),)- .unwrap())+ .unwrap());+ self.await_res = false;+ res}pub async fn batch_send_with_timeout<R: Wrapper<S> + Clone>(@@ -158,7 +171,8 @@ impl<S: Service> Connection<S> {requests: &[R],timeout: Duration,) -> Result<Vec<R::Response>> {- Ok(self+ self.await_res = true;+ let res = Ok(self.inner.send_with_timeout(&OneOrMany::Many(@@ -173,12 +187,18 @@ impl<S: Service> Connection<S> {.many().into_iter().map(|res| R::unwrap_response(res).unwrap())- .collect())+ .collect());+ self.await_res = false;+ res}pub async fn is_closed(&mut self) -> bool {self.inner.is_closed().await}++ pub fn awaiting_response(&self) -> bool {+ self.await_res+ }}macro_rules! sonic_service {@@ -194,7 +214,7 @@ macro_rules! sonic_service {pub enum Request {$($req(Box<$req>),)*}- #[derive(::bincode::Encode, ::bincode::Decode)]+ #[derive(::bincode::Encode, ::bincode::Decode, Debug)]pub enum Response {$($req(Box<<$req as sonic::service::Message<$service>>::Response>),)*}