From b87975300bcdb0b1020bd778f18d8b0812e413c1 Mon Sep 17 00:00:00 2001
From: Dmitrii Ubskii <18616863+dmitrii-ubskii@users.noreply.github.com>
Date: Fri, 8 Nov 2024 14:23:51 +0000
Subject: [PATCH] add timeout to channel builder

---
 rust/src/common/error.rs               |  4 ++++
 rust/src/connection/network/channel.rs | 14 +++++++++++---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/rust/src/common/error.rs b/rust/src/common/error.rs
index d6fb3908f0..2c226de5ec 100644
--- a/rust/src/common/error.rs
+++ b/rust/src/common/error.rs
@@ -74,6 +74,8 @@ error_messages! { ConnectionError
         23: "Invalid URL '{address}': missing port.",
     AddressTranslationMismatch { unknown: HashSet<Address>, unmapped: HashSet<Address> } =
         24: "Address translation map does not match the server's advertised address list. User-provided servers not in the advertised list: {unknown:?}. Advertised servers not mapped by user: {unmapped:?}.",
+    ConnectionTimedOut =
+        25: "Connection to the server timed out."
 }
 
 error_messages! { InternalError
@@ -196,6 +198,8 @@ impl From<Status> for Error {
             Self::Connection(ConnectionError::ServerConnectionFailedStatusError { error: status.message().to_owned() })
         } else if status.code() == Code::Unimplemented {
             Self::Connection(ConnectionError::RPCMethodUnavailable { message: status.message().to_owned() })
+        } else if status.code() == Code::Cancelled && status.message() == "Timeout expired" {
+            Self::Connection(ConnectionError::ConnectionTimedOut)
         } else {
             Self::from_message(status.message())
         }
diff --git a/rust/src/connection/network/channel.rs b/rust/src/connection/network/channel.rs
index efe852086d..ec526d64d3 100644
--- a/rust/src/connection/network/channel.rs
+++ b/rust/src/connection/network/channel.rs
@@ -17,7 +17,10 @@
  * under the License.
  */
 
-use std::sync::{Arc, RwLock};
+use std::{
+    sync::{Arc, RwLock},
+    time::Duration,
+};
 
 use tonic::{
     body::BoxBody,
@@ -49,8 +52,13 @@ impl GRPCChannel for PlainTextChannel {}
 
 impl GRPCChannel for CallCredChannel {}
 
+const TIMEOUT: Duration = Duration::from_secs(60);
+
 pub(super) fn open_plaintext_channel(address: Address) -> PlainTextChannel {
-    PlainTextChannel::new(Channel::builder(address.into_uri()).connect_lazy(), PlainTextFacade)
+    PlainTextChannel::new(
+        Channel::builder(address.into_uri()).timeout(TIMEOUT).connect_lazy(),
+        PlainTextFacade,
+    )
 }
 
 #[derive(Clone, Debug)]
@@ -66,7 +74,7 @@ pub(super) fn open_callcred_channel(
     address: Address,
     credential: Credential,
 ) -> Result<(CallCredChannel, Arc<CallCredentials>)> {
-    let mut builder = Channel::builder(address.into_uri());
+    let mut builder = Channel::builder(address.into_uri()).timeout(TIMEOUT);
     if credential.is_tls_enabled() {
         builder = builder.tls_config(credential.tls_config().clone().unwrap())?;
     }