refactor: add peer_hostname field in information_schema.cluster_info table

Cargo.toml

@@ -147,7 +147,7 @@ etcd-client = { git = "https://github.com/GreptimeTeam/etcd-client", rev = "f62d
 fst = "0.4.7"
 futures = "0.3"
 futures-util = "0.3"
-greptime-proto = { git = "https://github.com/GreptimeTeam/greptime-proto.git", rev = "d000eedd3739c003bb139aa42cefe05521a60f7d" }
+greptime-proto = { git = "https://github.com/GreptimeTeam/greptime-proto.git", rev = "710f1fa95cf68c1cf4e8b6d757bb418c4fddf4ed" }
 hex = "0.4"
 http = "1"
 humantime = "2.1"
@@ -207,6 +207,7 @@ rstest_reuse = "0.7"
 rust_decimal = "1.33"
 rustc-hash = "2.0"
 # It is worth noting that we should try to avoid using aws-lc-rs until it can be compiled on various platforms.
+hostname = "0.4.0"
 rustls = { version = "0.23.25", default-features = false }
 sea-query = "0.32"
 serde = { version = "1.0", features = ["derive"] }

src/catalog/src/system_schema/information_schema/cluster_info.rs

@@ -50,6 +50,7 @@ const PEER_TYPE_METASRV: &str = "METASRV";
 const PEER_ID: &str = "peer_id";
 const PEER_TYPE: &str = "peer_type";
 const PEER_ADDR: &str = "peer_addr";
+const PEER_HOSTNAME: &str = "peer_hostname";
 const CPUS: &str = "cpus";
 const MEMORY_BYTES: &str = "memory_bytes";
 const VERSION: &str = "version";
@@ -74,6 +75,7 @@ const INIT_CAPACITY: usize = 42;
 /// - `uptime`: the uptime of the peer.
 /// - `active_time`: the time since the last activity of the peer.
 /// - `node_status`: the status info of the peer.
+/// - `peer_hostname`: the hostname of the peer.
 ///
 #[derive(Debug)]
 pub(super) struct InformationSchemaClusterInfo {
@@ -94,6 +96,7 @@ impl InformationSchemaClusterInfo {
             ColumnSchema::new(PEER_ID, ConcreteDataType::int64_datatype(), false),
             ColumnSchema::new(PEER_TYPE, ConcreteDataType::string_datatype(), false),
             ColumnSchema::new(PEER_ADDR, ConcreteDataType::string_datatype(), true),
+            ColumnSchema::new(PEER_HOSTNAME, ConcreteDataType::string_datatype(), true),
             ColumnSchema::new(CPUS, ConcreteDataType::uint32_datatype(), false),
             ColumnSchema::new(MEMORY_BYTES, ConcreteDataType::uint64_datatype(), false),
             ColumnSchema::new(VERSION, ConcreteDataType::string_datatype(), false),
@@ -155,6 +158,7 @@ struct InformationSchemaClusterInfoBuilder {
     peer_ids: Int64VectorBuilder,
     peer_types: StringVectorBuilder,
     peer_addrs: StringVectorBuilder,
+    peer_hostnames: StringVectorBuilder,
     cpus: UInt32VectorBuilder,
     memory_bytes: UInt64VectorBuilder,
     versions: StringVectorBuilder,
@@ -173,6 +177,7 @@ impl InformationSchemaClusterInfoBuilder {
             peer_ids: Int64VectorBuilder::with_capacity(INIT_CAPACITY),
             peer_types: StringVectorBuilder::with_capacity(INIT_CAPACITY),
             peer_addrs: StringVectorBuilder::with_capacity(INIT_CAPACITY),
+            peer_hostnames: StringVectorBuilder::with_capacity(INIT_CAPACITY),
             cpus: UInt32VectorBuilder::with_capacity(INIT_CAPACITY),
             memory_bytes: UInt64VectorBuilder::with_capacity(INIT_CAPACITY),
             versions: StringVectorBuilder::with_capacity(INIT_CAPACITY),
@@ -203,6 +208,7 @@ impl InformationSchemaClusterInfoBuilder {
             (PEER_ID, &Value::from(peer_id)),
             (PEER_TYPE, &Value::from(peer_type)),
             (PEER_ADDR, &Value::from(node_info.peer.addr.as_str())),
+            (PEER_HOSTNAME, &Value::from(node_info.hostname.as_str())),
             (VERSION, &Value::from(node_info.version.as_str())),
             (GIT_COMMIT, &Value::from(node_info.git_commit.as_str())),
         ];
@@ -214,6 +220,7 @@ impl InformationSchemaClusterInfoBuilder {
         self.peer_ids.push(Some(peer_id));
         self.peer_types.push(Some(peer_type));
         self.peer_addrs.push(Some(&node_info.peer.addr));
+        self.peer_hostnames.push(Some(&node_info.hostname));
         self.versions.push(Some(&node_info.version));
         self.git_commits.push(Some(&node_info.git_commit));
         if node_info.start_time_ms > 0 {
@@ -253,6 +260,7 @@ impl InformationSchemaClusterInfoBuilder {
             Arc::new(self.peer_ids.finish()),
             Arc::new(self.peer_types.finish()),
             Arc::new(self.peer_addrs.finish()),
+            Arc::new(self.peer_hostnames.finish()),
             Arc::new(self.cpus.finish()),
             Arc::new(self.memory_bytes.finish()),
             Arc::new(self.versions.finish()),

src/common/meta/src/cluster.rs

@@ -124,6 +124,9 @@ pub struct NodeInfo {
     // The node build memory bytes
     #[serde(default)]
     pub memory_bytes: u64,
+    // The node build hostname
+    #[serde(default)]
+    pub hostname: String,
 }
 
 #[derive(Debug, Clone, Copy, Eq, Hash, PartialEq, Serialize, Deserialize)]
@@ -332,6 +335,7 @@ mod tests {
             start_time_ms: 1,
             cpus: 0,
             memory_bytes: 0,
+            hostname: "test_hostname".to_string(),
         };
 
         let node_info_bytes: Vec<u8> = node_info.try_into().unwrap();

src/datanode/Cargo.toml

@@ -43,6 +43,7 @@ datatypes.workspace = true
 file-engine.workspace = true
 futures.workspace = true
 futures-util.workspace = true
+hostname.workspace = true
 humantime-serde.workspace = true
 lazy_static.workspace = true
 log-store.workspace = true

src/datanode/src/heartbeat.rs

@@ -251,6 +251,10 @@ impl HeartbeatTask {
                     start_time_ms: node_epoch,
                     cpus,
                     memory_bytes,
+                    hostname: hostname::get()
+                        .unwrap_or_default()
+                        .to_string_lossy()
+                        .to_string(),
                 }),
                 node_workloads: Some(NodeWorkloads::Datanode(DatanodeWorkloads {
                     types: workload_types.iter().map(|w| w.to_i32()).collect(),

src/flow/Cargo.toml

@@ -48,6 +48,7 @@ enum_dispatch = "0.3"
 futures.workspace = true
 get-size2 = "0.1.2"
 greptime-proto.workspace = true
+hostname.workspace = true
 http.workspace = true
 humantime-serde.workspace = true
 itertools.workspace = true

src/flow/src/heartbeat.rs

@@ -185,6 +185,10 @@ impl HeartbeatTask {
             start_time_ms,
             cpus,
             memory_bytes,
+            hostname: hostname::get()
+                .unwrap_or_default()
+                .to_string_lossy()
+                .to_string(),
         })
     }
 

src/frontend/Cargo.toml

@@ -46,6 +46,7 @@ datafusion-expr.workspace = true
 datanode.workspace = true
 datatypes.workspace = true
 futures.workspace = true
+hostname.workspace = true
 humantime.workspace = true
 humantime-serde.workspace = true
 lazy_static.workspace = true

src/frontend/src/heartbeat.rs

@@ -158,6 +158,10 @@ impl HeartbeatTask {
             start_time_ms,
             cpus,
             memory_bytes,
+            hostname: hostname::get()
+                .unwrap_or_default()
+                .to_string_lossy()
+                .to_string(),
         })
     }
 

src/meta-client/src/client.rs

@@ -353,6 +353,8 @@ impl ProcedureExecutor for MetaClient {
     }
 }
 
+// TODO(zyy17): Allow deprecated fields for backward compatibility. Remove this when the deprecated fields are removed from the proto.
+#[allow(deprecated)]
 #[async_trait::async_trait]
 impl ClusterInfo for MetaClient {
     type Error = Error;
@@ -372,25 +374,61 @@ impl ClusterInfo for MetaClient {
             let (leader, followers) = cluster_client.get_metasrv_peers().await?;
             followers
                 .into_iter()
-                .map(|node| NodeInfo {
-                    peer: node.peer.unwrap_or_default(),
-                    last_activity_ts,
-                    status: NodeStatus::Metasrv(MetasrvStatus { is_leader: false }),
-                    version: node.version,
-                    git_commit: node.git_commit,
-                    start_time_ms: node.start_time_ms,
-                    cpus: node.cpus,
-                    memory_bytes: node.memory_bytes,
+                .map(|node| {
+                    if let Some(node_info) = node.info {
+                        NodeInfo {
+                            peer: node.peer.unwrap_or_default(),
+                            last_activity_ts,
+                            status: NodeStatus::Metasrv(MetasrvStatus { is_leader: false }),
+                            version: node_info.version,
+                            git_commit: node_info.git_commit,
+                            start_time_ms: node_info.start_time_ms,
+                            cpus: node_info.cpus,
+                            memory_bytes: node_info.memory_bytes,
+                            hostname: node_info.hostname,
+                        }
+                    } else {
+                        // TODO(zyy17): It's for backward compatibility. Remove this when the deprecated fields are removed from the proto.
+                        NodeInfo {
+                            peer: node.peer.unwrap_or_default(),
+                            last_activity_ts,
+                            status: NodeStatus::Metasrv(MetasrvStatus { is_leader: false }),
+                            version: node.version,
+                            git_commit: node.git_commit,
+                            start_time_ms: node.start_time_ms,
+                            cpus: node.cpus,
+                            memory_bytes: node.memory_bytes,
+                            hostname: "".to_string(),
+                        }
+                    }
                 })
-                .chain(leader.into_iter().map(|node| NodeInfo {
-                    peer: node.peer.unwrap_or_default(),
-                    last_activity_ts,
-                    status: NodeStatus::Metasrv(MetasrvStatus { is_leader: true }),
-                    version: node.version,
-                    git_commit: node.git_commit,
-                    start_time_ms: node.start_time_ms,
-                    cpus: node.cpus,
-                    memory_bytes: node.memory_bytes,
+                .chain(leader.into_iter().map(|node| {
+                    if let Some(node_info) = node.info {
+                        NodeInfo {
+                            peer: node.peer.unwrap_or_default(),
+                            last_activity_ts,
+                            status: NodeStatus::Metasrv(MetasrvStatus { is_leader: true }),
+                            version: node_info.version,
+                            git_commit: node_info.git_commit,
+                            start_time_ms: node_info.start_time_ms,
+                            cpus: node_info.cpus,
+                            memory_bytes: node_info.memory_bytes,
+                            hostname: node_info.hostname,
+                        }
+                    } else {
+                        // TODO(zyy17): It's for backward compatibility. Remove this when the deprecated fields are removed from the proto.
+                        NodeInfo {
+                            peer: node.peer.unwrap_or_default(),
+                            last_activity_ts,
+                            status: NodeStatus::Metasrv(MetasrvStatus { is_leader: true }),
+                            version: node.version,
+                            git_commit: node.git_commit,
+                            start_time_ms: node.start_time_ms,
+                            cpus: node.cpus,
+                            memory_bytes: node.memory_bytes,
+                            hostname: "".to_string(),
+                        }
+                    }
                 }))
                 .collect::<Vec<_>>()
         } else {

src/meta-srv/Cargo.toml

@@ -53,6 +53,7 @@ either.workspace = true
 etcd-client.workspace = true
 futures.workspace = true
 h2 = "0.3"
+hostname.workspace = true
 http-body-util = "0.1"
 humantime.workspace = true
 humantime-serde.workspace = true

src/meta-srv/src/discovery/lease.rs

@@ -245,6 +245,7 @@ mod tests {
             start_time_ms: current_time_millis() as u64,
             cpus: 0,
             memory_bytes: 0,
+            hostname: "test_hostname".to_string(),
         };
 
         let key_prefix = NodeInfoKey::key_prefix_with_role(Role::Frontend);
@@ -270,6 +271,7 @@ mod tests {
             start_time_ms: current_time_millis() as u64,
             cpus: 0,
             memory_bytes: 0,
+            hostname: "test_hostname".to_string(),
         };
 
         in_memory
@@ -307,6 +309,7 @@ mod tests {
             start_time_ms: last_activity_ts as u64,
             cpus: 0,
             memory_bytes: 0,
+            hostname: "test_hostname".to_string(),
         };
 
         let key_prefix = NodeInfoKey::key_prefix_with_role(Role::Frontend);

src/meta-srv/src/election/rds/mysql.rs

@@ -1163,6 +1163,7 @@ mod tests {
             start_time_ms: 0,
             cpus: 0,
             memory_bytes: 0,
+            hostname: "test_hostname".to_string(),
         };
         mysql_election.register_candidate(&node_info).await.unwrap();
     }

src/meta-srv/src/election/rds/postgres.rs

@@ -1002,6 +1002,7 @@ mod tests {
             start_time_ms: 0,
             cpus: 0,
             memory_bytes: 0,
+            hostname: "test_hostname".to_string(),
         };
         pg_election.register_candidate(&node_info).await.unwrap();
     }

src/meta-srv/src/handler/collect_cluster_info_handler.rs

@@ -54,6 +54,7 @@ impl HeartbeatHandler for CollectFrontendClusterInfoHandler {
             start_time_ms: info.start_time_ms,
             cpus: info.cpus,
             memory_bytes: info.memory_bytes,
+            hostname: info.hostname,
         };
 
         put_into_memory_store(ctx, key, value).await?;
@@ -89,6 +90,7 @@ impl HeartbeatHandler for CollectFlownodeClusterInfoHandler {
             start_time_ms: info.start_time_ms,
             cpus: info.cpus,
             memory_bytes: info.memory_bytes,
+            hostname: info.hostname,
         };
 
         put_into_memory_store(ctx, key, value).await?;
@@ -142,6 +144,7 @@ impl HeartbeatHandler for CollectDatanodeClusterInfoHandler {
             start_time_ms: info.start_time_ms,
             cpus: info.cpus,
             memory_bytes: info.memory_bytes,
+            hostname: info.hostname,
         };
 
         put_into_memory_store(ctx, key, value).await?;