Change to DBConnector::clone_timeout_async

Cargo.toml

@@ -98,6 +98,7 @@ swbus-actor = { version = "0.1.0", path = "crates/swbus-actor" }
 sonicdb-derive = { version = "0.1.0", path = "crates/sonicdb-derive" }
 sonic-dash-api-proto = { version = "0.1.0", path = "crates/sonic-dash-api-proto" }
 swss-common = { git = "https://github.com/sonic-net/sonic-swss-common.git", branch = "master" }
+swss-common-testing = { git = "https://github.com/sonic-net/sonic-swss-common.git", branch = "master" }
 
 # Dev dependencies
 criterion = "0.5"

crates/container/Cargo.toml

@@ -14,7 +14,7 @@ chrono = { workspace = true }
 enumset = { workspace = true }
 futures-util = { workspace = true }
 clap = { workspace = true }
-swss-common = { git = "https://github.com/sonic-net/sonic-swss-common.git", branch = "master" }
+swss-common = { workspace = true }
 tokio = { workspace = true }
 serde_json = { workspace = true }
 thiserror = { workspace = true }

crates/hamgrd/Cargo.toml

@@ -15,10 +15,10 @@ edition.workspace = true
 [dependencies]
 swbus-edge = { path = "../swbus-edge" }
 swbus-actor = { path = "../swbus-actor" }
-swss-common = { git = "https://github.com/sonic-net/sonic-swss-common.git", branch = "master" }
+swss-common.workspace = true
 swss-common-bridge = { path = "../swss-common-bridge" }
 swss-serde = { path = "../swss-serde" }
-swss-common-testing = { git = "https://github.com/sonic-net/sonic-swss-common.git", branch = "master" }
+swss-common-testing.workspace = true
 swbus-config.workspace = true
 sonic-common.workspace = true
 sonicdb-derive.workspace = true

crates/sonic-common/Cargo.toml

@@ -24,7 +24,7 @@ signal-hook.workspace = true
 color-eyre.workspace = true
 
 # internal dependencies
-swss-common = { git = "https://github.com/sonic-net/sonic-swss-common.git", branch = "master" }
+swss-common.workspace = true
 
 # Utils
 lazy_static.workspace = true

crates/sonicdb-derive/Cargo.toml

@@ -12,7 +12,7 @@ edition.workspace = true
 syn = "2.0"         # For parsing Rust code
 quote = "1.0"       # For generating Rust code
 proc-macro2 = "1.0" # For working with procedural macros
-swss-common = { git = "https://github.com/sonic-net/sonic-swss-common.git", branch = "master" }
+swss-common.workspace = true
 sonic-common.workspace = true
 
 [lib]

crates/swbus-actor/Cargo.toml

@@ -10,7 +10,7 @@ edition.workspace = true
 
 [dependencies]
 swbus-edge = { path = "../swbus-edge" }
-swss-common = { git = "https://github.com/sonic-net/sonic-swss-common.git", branch = "master", features = ["async"]  }
+swss-common = { workspace = true, features = ["async"] }
 tokio.workspace = true
 serde.workspace = true
 serde_json.workspace = true
@@ -23,4 +23,4 @@ sonic-common.workspace = true
 workspace = true
 
 [dev-dependencies]
-swss-common-testing = { git = "https://github.com/sonic-net/sonic-swss-common.git", branch = "master" }
+swss-common-testing.workspace = true

crates/swbus-cli/Cargo.toml

@@ -35,8 +35,8 @@ swbus-config.workspace = true
 swbus-actor.workspace = true
 
 [dev-dependencies]
-swss-common-testing = { git = "https://github.com/sonic-net/sonic-swss-common.git", branch = "master" }
-swss-common = { git = "https://github.com/sonic-net/sonic-swss-common.git", branch = "master" }
+swss-common-testing.workspace = true
+swss-common.workspace = true
 swss-serde.workspace = true
 
 [lints]

crates/swbus-config/Cargo.toml

@@ -15,11 +15,11 @@ serde_json.workspace = true
 thiserror.workspace = true
 tracing.workspace = true
 swss-serde.workspace = true
-swss-common = { git = "https://github.com/sonic-net/sonic-swss-common.git", branch = "master" }
+swss-common.workspace = true
 swbus-proto.workspace = true
 
 [dev-dependencies]
-swss-common-testing = { git = "https://github.com/sonic-net/sonic-swss-common.git", branch = "master" }
+swss-common-testing.workspace = true
 tempfile.workspace = true
 
 [lints]

crates/swss-common-bridge/Cargo.toml

@@ -9,7 +9,7 @@ keywords.workspace = true
 edition.workspace = true
 
 [dependencies]
-swss-common = { git = "https://github.com/sonic-net/sonic-swss-common.git", branch = "master", features = ["async"]  }
+swss-common = { workspace = true, features = ["async"] }
 swbus-edge = { path = "../swbus-edge" }
 tokio.workspace = true
 tokio-util.workspace = true
@@ -27,4 +27,4 @@ tracing.workspace = true
 workspace = true
 
 [dev-dependencies]
-swss-common-testing = { git = "https://github.com/sonic-net/sonic-swss-common.git", branch = "master" }
+swss-common-testing.workspace = true

crates/swss-common-bridge/src/consumer.rs

@@ -135,7 +135,11 @@ pub trait ConsumerTable: Send + 'static {
 
 macro_rules! rehydrate_body {
     (true, $self:ident) => {{
-        let db = $self.db_connector_mut().clone_async().await;
+        let db = $self
+            .db_connector_mut()
+            .clone_timeout_async(15000)
+            .await
+            .expect("Failed to clone db connection");
         let mut tbl = Table::new_async(db, $self.table_name()).await.expect("Table::new");
         let keys = tbl.get_keys_async().await.expect("Table::get_keys");
 

crates/swss-serde/Cargo.toml

@@ -10,11 +10,11 @@ edition.workspace = true
 
 [dependencies]
 serde.workspace = true
-swss-common = { git = "https://github.com/sonic-net/sonic-swss-common.git", branch = "master" }
+swss-common.workspace = true
 serde_serializer_quick_unsupported = "0.1"
 
 [lints]
 workspace = true
 
 [dev-dependencies]
-swss-common-testing = { git = "https://github.com/sonic-net/sonic-swss-common.git", branch = "master" }
+swss-common-testing.workspace = true