From 13c67d9d321cfc667ae7c0c9cf745704855a31d5 Mon Sep 17 00:00:00 2001
From: JeremyHi <jiachun_feng@proton.me>
Date: Tue, 10 Oct 2023 15:30:48 +0800
Subject: [PATCH] fix: support multi addrs while using etcd (#2562)

fix: support multi addrs while useing etcd
---
 src/meta-srv/src/bootstrap.rs | 9 +++++++--
 src/meta-srv/src/metasrv.rs   | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/meta-srv/src/bootstrap.rs b/src/meta-srv/src/bootstrap.rs
index eaa79ee8775c..b24aa46e4d28 100644
--- a/src/meta-srv/src/bootstrap.rs
+++ b/src/meta-srv/src/bootstrap.rs
@@ -169,8 +169,13 @@ pub async fn build_meta_srv(opts: &MetaSrvOptions, plugins: Plugins) -> Result<M
             Some(Arc::new(MemLock::default()) as _),
         )
     } else {
-        let etcd_endpoints = [&opts.store_addr];
-        let etcd_client = Client::connect(etcd_endpoints, None)
+        let etcd_endpoints = opts
+            .store_addr
+            .split(',')
+            .map(|x| x.trim())
+            .filter(|x| !x.is_empty())
+            .collect::<Vec<_>>();
+        let etcd_client = Client::connect(&etcd_endpoints, None)
             .await
             .context(error::ConnectEtcdSnafu)?;
         (
diff --git a/src/meta-srv/src/metasrv.rs b/src/meta-srv/src/metasrv.rs
index 39aeae24439b..90ae491bc9cb 100644
--- a/src/meta-srv/src/metasrv.rs
+++ b/src/meta-srv/src/metasrv.rs
@@ -72,7 +72,7 @@ impl Default for MetaSrvOptions {
             store_addr: "127.0.0.1:2379".to_string(),
             selector: SelectorType::default(),
             use_memory_store: false,
-            enable_region_failover: true,
+            enable_region_failover: false,
             http: HttpOptions::default(),
             logging: LoggingOptions {
                 dir: format!("{METASRV_HOME}/logs"),