chore: minor update

Signed-off-by: shuiyisong <[email protected]>

Author: shuiyisong

src/common/grpc/src/channel_manager.rs

@@ -31,7 +31,7 @@ use tonic::transport::{
 use tower::Service;
 
 use crate::error::{CreateChannelSnafu, InvalidConfigFilePathSnafu, Result};
-use crate::reloadable_tls::{ReloadableTlsConfig, TlsConfigLoader};
+use crate::reloadable_tls::{ReloadableTlsConfig, TlsConfigLoader, maybe_watch_tls_config};
 
 const RECYCLE_CHANNEL_INTERVAL_SECS: u64 = 60;
 pub const DEFAULT_GRPC_REQUEST_TIMEOUT_SECS: u64 = 10;
@@ -340,13 +340,11 @@ pub fn load_client_tls_config(
 
 pub fn maybe_watch_client_tls_config(
     client_tls_config: Arc<ReloadableClientTlsConfig>,
-    channel_manager: &ChannelManager,
+    channel_manager: ChannelManager,
 ) -> Result<()> {
-    let channel_manager_for_watcher = channel_manager.clone();
-
-    crate::reloadable_tls::maybe_watch_tls_config(client_tls_config, move || {
+    maybe_watch_tls_config(client_tls_config, move || {
         // Clear all existing channels to force reconnection with new certificates
-        channel_manager_for_watcher.clear_all_channels();
+        channel_manager.clear_all_channels();
         info!("Cleared all existing channels to use new TLS certificates.");
     })
 }

src/common/grpc/src/reloadable_tls.rs

@@ -13,6 +13,7 @@
 // limitations under the License.
 
 use std::path::Path;
+use std::result::Result as StdResult;
 use std::sync::atomic::{AtomicUsize, Ordering};
 use std::sync::mpsc::channel;
 use std::sync::{Arc, RwLock};
@@ -28,7 +29,7 @@ pub trait TlsConfigLoader<T> {
     type Error;
 
     /// Load the TLS configuration
-    fn load(&self) -> std::result::Result<Option<T>, Self::Error>;
+    fn load(&self) -> StdResult<Option<T>, Self::Error>;
 
     /// Get paths to certificate files for watching
     fn watch_paths(&self) -> Vec<&Path>;
@@ -57,7 +58,7 @@ where
     O: TlsConfigLoader<T>,
 {
     /// Create config by loading configuration from the option type
-    pub fn try_new(tls_option: O) -> std::result::Result<Self, O::Error> {
+    pub fn try_new(tls_option: O) -> StdResult<Self, O::Error> {
         let config = tls_option.load()?;
         Ok(Self {
             tls_option,
@@ -67,7 +68,7 @@ where
     }
 
     /// Reread certificates and keys from file system.
-    pub fn reload(&self) -> std::result::Result<(), O::Error> {
+    pub fn reload(&self) -> StdResult<(), O::Error> {
         let config = self.tls_option.load()?;
         *self.config.write().unwrap() = config;
         self.version.fetch_add(1, Ordering::Relaxed);

src/common/grpc/tests/mod.rs

@@ -108,7 +108,7 @@ async fn test_reloadable_client_tls_config() {
     let config = ChannelConfig::new();
     let manager = ChannelManager::with_config(config, Some(reloadable_config.clone()));
 
-    maybe_watch_client_tls_config(reloadable_config.clone(), &manager)
+    maybe_watch_client_tls_config(reloadable_config.clone(), manager.clone())
         .expect("failed to watch client config");
 
     assert_eq!(0, reloadable_config.get_version());