From 7d0d8dc6e3e766bb3d215e382918b3d8ea849afd Mon Sep 17 00:00:00 2001 From: Weny Xu Date: Mon, 7 Aug 2023 18:01:42 +0800 Subject: [PATCH] feat: return metasrv leader addr (#2110) --- src/meta-client/src/client.rs | 2 +- src/meta-client/src/client/heartbeat.rs | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/meta-client/src/client.rs b/src/meta-client/src/client.rs index d82078145d..92f187465a 100644 --- a/src/meta-client/src/client.rs +++ b/src/meta-client/src/client.rs @@ -210,7 +210,7 @@ impl MetaClient { /// Ask the leader address of `metasrv`, and the heartbeat component /// needs to create a bidirectional streaming to the leader. - pub async fn ask_leader(&self) -> Result<()> { + pub async fn ask_leader(&self) -> Result { self.heartbeat_client()?.ask_leader().await } diff --git a/src/meta-client/src/client/heartbeat.rs b/src/meta-client/src/client/heartbeat.rs index 0ec04d0537..acc39af233 100644 --- a/src/meta-client/src/client/heartbeat.rs +++ b/src/meta-client/src/client/heartbeat.rs @@ -107,7 +107,7 @@ impl Client { inner.start(urls).await } - pub async fn ask_leader(&mut self) -> Result<()> { + pub async fn ask_leader(&mut self) -> Result { let inner = self.inner.read().await; inner.ask_leader().await } @@ -169,7 +169,7 @@ impl Inner { Ok(()) } - async fn ask_leader(&self) -> Result<()> { + async fn ask_leader(&self) -> Result { ensure!( self.is_started(), error::IllegalGrpcClientStateSnafu { @@ -177,8 +177,7 @@ impl Inner { } ); - let _ = self.ask_leader.as_ref().unwrap().ask_leader().await; - Ok(()) + self.ask_leader.as_ref().unwrap().ask_leader().await } async fn heartbeat(&self) -> Result<(HeartbeatSender, HeartbeatStream)> {