chore: remove unused config_id from RaftConfig (#16902)

* chore: optimize meta-service initialization

Try initialize instead of check `is_open` flag.
This flag may not be accurate: the raft storage is opend but no
initialization is done yet.

And remove trait `Opened` and refactor related struct names

* chore: remove unused config_id from RaftConfig

`config_id` is used for separate sled-db key spaces for parallel tests.
Since sled db is removed, this `config_id` is useless.

Author: drmingdrmer

src/meta/binaries/meta/entry.rs

@@ -197,7 +197,7 @@ pub async fn entry(conf: Config) -> anyhow::Result<()> {
 }
 
 async fn do_register(meta_node: &Arc<MetaNode>, conf: &Config) -> Result<(), MetaAPIError> {
-    let node_id = meta_node.sto.id;
+    let node_id = meta_node.raft_store.id;
     let raft_endpoint = conf.raft_config.raft_api_advertise_host_endpoint();
     let node = Node::new(node_id, raft_endpoint)
         .with_grpc_advertise_address(conf.grpc_api_advertise_address());

src/meta/binaries/metactl/export_from_disk.rs

@@ -17,7 +17,7 @@ use std::io::Write;
 use std::sync::Arc;
 
 use databend_common_meta_raft_store::config::RaftConfig;
-use databend_meta::store::StoreInner;
+use databend_meta::store::RaftStoreInner;
 use futures::TryStreamExt;
 
 use crate::upgrade;
@@ -36,7 +36,7 @@ pub async fn export_from_dir(args: &ExportArgs) -> anyhow::Result<()> {
     eprintln!();
     eprintln!("Export:");
 
-    let sto_inn = StoreInner::open(&raft_config).await?;
+    let sto_inn = RaftStoreInner::open(&raft_config).await?;
     let mut lines = Arc::new(sto_inn).export();
 
     eprintln!("    From: {}", raft_config.raft_dir);

src/meta/service/src/api/grpc/grpc_service.rs

@@ -362,7 +362,7 @@ impl MetaService for MetaServiceImpl {
         let _guard = RequestInFlight::guard();
 
         let meta_node = &self.meta_node;
-        let strm = meta_node.sto.inner().export();
+        let strm = meta_node.raft_store.inner().export();
 
         let chunk_size = 32;
         // - Chunk up upto 32 Ok items inside a Vec<String>;
@@ -390,7 +390,7 @@ impl MetaService for MetaServiceImpl {
         let _guard = RequestInFlight::guard();
 
         let meta_node = &self.meta_node;
-        let strm = meta_node.sto.inner().export();
+        let strm = meta_node.raft_store.inner().export();
 
         let chunk_size = request.get_ref().chunk_size.unwrap_or(32) as usize;
         // - Chunk up upto `chunk_size` Ok items inside a Vec<String>;

src/meta/service/src/configs/outer_v0.rs

@@ -279,7 +279,6 @@ pub struct ConfigViaEnv {
     pub grpc_tls_server_cert: String,
     pub grpc_tls_server_key: String,
 
-    pub config_id: String,
     pub kvsrv_listen_host: String,
     pub kvsrv_advertise_host: String,
     pub kvsrv_api_port: u16,
@@ -338,7 +337,6 @@ impl From<Config> for ConfigViaEnv {
             metasrv_grpc_api_advertise_host: cfg.grpc_api_advertise_host,
             grpc_tls_server_cert: cfg.grpc_tls_server_cert,
             grpc_tls_server_key: cfg.grpc_tls_server_key,
-            config_id: cfg.raft_config.config_id,
             kvsrv_listen_host: cfg.raft_config.raft_listen_host,
             kvsrv_advertise_host: cfg.raft_config.raft_advertise_host,
             kvsrv_api_port: cfg.raft_config.raft_api_port,
@@ -377,7 +375,6 @@ impl From<Config> for ConfigViaEnv {
 impl Into<Config> for ConfigViaEnv {
     fn into(self) -> Config {
         let raft_config = RaftConfig {
-            config_id: self.config_id,
             raft_listen_host: self.kvsrv_listen_host,
             raft_advertise_host: self.kvsrv_advertise_host,
             raft_api_port: self.kvsrv_api_port,
@@ -457,11 +454,6 @@ impl Into<Config> for ConfigViaEnv {
 #[clap(about, version, author)]
 #[serde(default)]
 pub struct RaftConfig {
-    /// Identify a config.
-    /// This is only meant to make debugging easier with more than one Config involved.
-    #[clap(long, default_value = "")]
-    pub config_id: String,
-
     /// The local listening host for metadata communication.
     /// This config does not need to be stored in raft-store,
     /// only used when metasrv startup and listen to.
@@ -610,7 +602,7 @@ impl Default for RaftConfig {
 impl From<RaftConfig> for InnerRaftConfig {
     fn from(x: RaftConfig) -> InnerRaftConfig {
         InnerRaftConfig {
-            config_id: x.config_id,
+            config_id: "".to_string(),
             raft_listen_host: x.raft_listen_host,
             raft_advertise_host: x.raft_advertise_host,
             raft_api_port: x.raft_api_port,
@@ -649,7 +641,6 @@ impl From<RaftConfig> for InnerRaftConfig {
 impl From<InnerRaftConfig> for RaftConfig {
     fn from(inner: InnerRaftConfig) -> Self {
         Self {
-            config_id: inner.config_id,
             raft_listen_host: inner.raft_listen_host,
             raft_advertise_host: inner.raft_advertise_host,
             raft_api_port: inner.raft_api_port,

src/meta/service/src/lib.rs

@@ -27,9 +27,3 @@ pub(crate) mod request_handling;
 pub mod store;
 pub mod version;
 pub mod watcher;
-
-pub trait Opened {
-    /// Return true if it is opened from a previous persistent state.
-    /// Otherwise it is just created.
-    fn is_opened(&self) -> bool;
-}

src/meta/service/src/meta_service/forwarder.rs

@@ -47,7 +47,7 @@ pub struct MetaForwarder<'a> {
 impl<'a> MetaForwarder<'a> {
     pub fn new(meta_node: &'a MetaNode) -> Self {
         Self {
-            sto: &meta_node.sto,
+            sto: &meta_node.raft_store,
             raft: &meta_node.raft,
         }
     }

src/meta/service/src/meta_service/meta_leader.rs

@@ -167,7 +167,7 @@ impl<'a> Handler<MetaGrpcReadReq> for MetaLeader<'a> {
 impl<'a> MetaLeader<'a> {
     pub fn new(meta_node: &'a MetaNode) -> MetaLeader {
         MetaLeader {
-            sto: &meta_node.sto,
+            sto: &meta_node.raft_store,
             raft: &meta_node.raft,
         }
     }