Merge pull request #332 from eclipse-pullpiri/hotfix-nodeinfo

youngtaekiim · web-flow · commit d3b20c8c2a37 · 2025-10-14T10:41:00.000+09:00
Hotfix nodeinfo
diff --git a/Makefile b/Makefile
@@ -63,6 +63,8 @@ install:
 	-mkdir -p /etc/containers/systemd/piccolo/etcd-data/
 	-cp -r ./src/settings.yaml /etc/containers/systemd/piccolo/
 	-cp -r ./containers/piccolo-*.* /etc/containers/systemd/piccolo/
+	-cp -r ./scripts/update_server_ip.sh /etc/containers/systemd/piccolo/
+	
 	systemctl daemon-reload
 	systemctl start piccolo-server
 	systemctl start piccolo-player
diff --git a/containers/piccolo-player.yaml b/containers/piccolo-player.yaml
@@ -26,7 +26,7 @@ spec:
     - name: systemd
       mountPath: /etc/containers/systemd
     - name: config-path
-      mountPath: /piccolo/settings.yaml
+      mountPath: /etc/piccolo/settings.yaml
   - name: statemanager
     image: localhost/pullpiri:latest
     command: ["/piccolo/statemanager"]
@@ -38,7 +38,7 @@ spec:
     - name: systemd
       mountPath: /etc/containers/systemd
     - name: config-path
-      mountPath: /piccolo/settings.yaml
+      mountPath: /etc/piccolo/settings.yaml
   volumes:
   - name: piccolo-yaml
     hostPath:
diff --git a/containers/piccolo-server.kube b/containers/piccolo-server.kube
@@ -11,3 +11,5 @@ Yaml=/etc/containers/systemd/piccolo/piccolo-server.yaml
 
 [Service]
 Restart=always
+# settings.yaml에서 IP를 읽어서 yaml 파일을 동적으로 수정하는 스크립트 실행
+ExecStartPre=/etc/containers/systemd/piccolo/update_server_ip.sh
diff --git a/containers/piccolo-server.yaml b/containers/piccolo-server.yaml
@@ -15,7 +15,10 @@ spec:
   - name: etcd
     image: gcr.io/etcd-development/etcd:v3.5.11
     command: ["/usr/local/bin/etcd"]
-    args: ["--data-dir=/etcd-data"]
+    args: 
+    - "--data-dir=/etcd-data"
+    - "--listen-client-urls=http://127.0.0.1:2379,http://$(HOST_IP):2379"
+    - "--advertise-client-urls=http://$(HOST_IP):2379"
     volumeMounts:
     - name: etcd-data
       mountPath: /etcd-data
@@ -26,7 +29,7 @@ spec:
     - name: piccolo-yaml
       mountPath: /etc/piccolo/yaml
     - name: config-path
-      mountPath: /piccolo/settings.yaml
+      mountPath: /etc/piccolo/settings.yaml
   - name: policymanager
     image: localhost/pullpiri:latest
     command: ["/piccolo/policymanager"]
@@ -40,7 +43,7 @@ spec:
     - name: piccolo-yaml
       mountPath: /etc/piccolo/yaml
     - name: config-path
-      mountPath: /piccolo/settings.yaml
+      mountPath: /etc/piccolo/settings.yaml
   volumes:
   - name: piccolo-yaml
     hostPath:
diff --git a/scripts/update_server_ip.sh b/scripts/update_server_ip.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+# settings.yaml 파일에서 IP를 추출하여 YAML 파일의 $(HOST_IP) 패턴을 대체하는 스크립트
+
+# 입력 및 출력 파일 경로
+SETTINGS_YAML="/etc/containers/systemd/piccolo/settings.yaml"
+SERVER_YAML="/etc/containers/systemd/piccolo/piccolo-server.yaml"
+
+# settings.yaml에서 IP 주소 추출
+HOST_IP=$(grep -A 3 "host:" $SETTINGS_YAML | grep "ip:" | sed -e "s/^[ ]*ip:[ ]*//" -e "s/[ ]*$//")
+echo "Extracted HOST_IP: $HOST_IP"
+
+# IP 주소가 비어있는지 확인
+if [ -z "$HOST_IP" ]; then
+  echo "Failed to extract host IP from settings.yaml"
+  exit 1
+fi
+
+# 문자 그대로의 $(HOST_IP)를 실제 IP 주소로 대체
+sed -i "s/\\\$(HOST_IP)/${HOST_IP}/g" $SERVER_YAML
+
+echo "Successfully replaced \$(HOST_IP) with $HOST_IP in $SERVER_YAML"
+exit 0
diff --git a/src/player/Cargo.lock b/src/player/Cargo.lock
diff --git a/src/player/actioncontroller/Cargo.toml b/src/player/actioncontroller/Cargo.toml
@@ -13,5 +13,6 @@ prost = "0.13.3"
 dbus = "0.9.7"
 serde = { version = "1.0.214", features = ["derive"] }
 serde_yaml = "0.9"
+serde_json = "1.0"
 common = { workspace = true }
 base64 = "0.22.1"
diff --git a/src/player/actioncontroller/src/manager.rs b/src/player/actioncontroller/src/manager.rs
@@ -2,14 +2,14 @@ use std::{thread, time::Duration};
 
 use crate::grpc::sender::statemanager::StateManagerSender;
 use crate::{grpc::sender::pharos::request_network_pod, runtime::bluechi};
-use base64::Engine;
+use serde_json;
 use common::{
     actioncontroller::PodStatus as Status,
     spec::artifact::{Package, Scenario},
     statemanager::{ResourceType, StateChange},
     Result,
 };
-use prost::Message; // Prost Message 트레이트 추가 // base64 Engine 트레이트 추가
+ // Prost Message 트레이트 추가 // base64 Engine 트레이트 추가
 
 /// Manager for coordinating scenario actions and workload operations
 ///
@@ -81,9 +81,9 @@ impl ActionControllerManager {
             }
         };
 
-        // 2. 이제 cluster/nodes 접두사에서 상세 정보 조회 시도
+        // 2. 이제 cluster/nodes 접두사에서 상세 정보 조회 시도 (json string)
         let cluster_node_key = format!("cluster/nodes/{}", node_name);
-        let encoded = match common::etcd::get(&cluster_node_key).await {
+        let node_json = match common::etcd::get(&cluster_node_key).await {
             Ok(value) => value,
             Err(e) => {
                 println!(
@@ -107,9 +107,8 @@ impl ActionControllerManager {
             }
         };
 
-        // 3. base64 디코드 및 NodeInfo 디코드
-        let buf = base64::engine::general_purpose::STANDARD.decode(&encoded)?;
-        let node_info = common::apiserver::NodeInfo::decode(buf.as_slice())?;
+        // 3. json 파싱
+        let node_info: common::apiserver::NodeInfo = serde_json::from_str(&node_json)?;
 
         // 4. node_role 값에 따라 노드 유형 결정 (node_role: 3 = Bluechi, 2 = Nodeagent)
         let role = if node_info.node_role == 3 {
diff --git a/src/player/filtergateway/src/vehicle/dds/mod.rs b/src/player/filtergateway/src/vehicle/dds/mod.rs
@@ -214,7 +214,7 @@ impl DdsManager {
             env::var("PICCOLO_SETTINGS_PATH")
                 .map(PathBuf::from)
                 .unwrap_or_else(|_| {
-                    PathBuf::from("/home/edo/2025/projects/pullpiri/src/settings.yaml")
+                    PathBuf::from("/etc/piccolo/settings.yaml")
                 })
         });
 
diff --git a/src/server/apiserver/src/grpc/receiver.rs b/src/server/apiserver/src/grpc/receiver.rs
@@ -8,7 +8,7 @@ use base64::Engine;
 use common::apiserver::api_server_connection_server::ApiServerConnection;
 use common::apiserver::{
     ClusterTopology, GetNodeRequest, GetNodeResponse, GetNodesRequest, GetNodesResponse,
-    GetTopologyRequest, GetTopologyResponse, NodeInfo, TopologyType, UpdateTopologyRequest,
+    GetTopologyRequest, GetTopologyResponse, TopologyType, UpdateTopologyRequest,
     UpdateTopologyResponse,
 };
 use common::etcd;
@@ -50,11 +50,10 @@ impl NodeRegistry {
     ) -> Result<ClusterTopology, Box<dyn std::error::Error + Send + Sync>> {
         let topology_key = "cluster/topology";
 
-        let mut buf = Vec::new();
-        prost::Message::encode(&topology, &mut buf)?;
-        let encoded = base64::engine::general_purpose::STANDARD.encode(&buf);
-
-        etcd::put(topology_key, &encoded).await?;
+        // 인코딩을 제거하고 json string으로 변환
+        let topology_json = serde_json::to_string(&topology)?;
+        
+        etcd::put(topology_key, &topology_json).await?;
 
         println!("Updated cluster topology: {}", topology.cluster_name);
         Ok(topology)
@@ -166,14 +165,13 @@ impl ApiServerConnection for ApiServerReceiver {
                     metadata: req.metadata.clone(),
                 };
 
-                let mut buf = Vec::new();
-                prost::Message::encode(&node_info, &mut buf).unwrap();
-                let encoded = base64::engine::general_purpose::STANDARD.encode(&buf);
+                // 인코딩을 제거하고 json string으로 저장
+                let node_json = serde_json::to_string(&node_info).unwrap();
 
                 // 두 가지 키로 저장
-                // 1. IP 주소로 빠른 조회용 (기존 코드)
-                let _ = common::etcd::put(&format!("nodes/{}", req.ip_address), &encoded).await;
-                println!("Node info stored at IP key: nodes/{}", req.ip_address);
+                // 1. IP 주소로 빠른 조회용 (json 문자열로 변경)
+                let _ = common::etcd::put(&format!("nodes/{}", req.ip_address), &req.hostname).await;
+                println!("Hostname stored at IP key: nodes/{}", req.ip_address);
 
                 // 2. 호스트 이름으로 빠른 조회용 (ActionController용)
                 let _ =
diff --git a/src/server/apiserver/src/grpc/sender/statemanager.rs b/src/server/apiserver/src/grpc/sender/statemanager.rs
@@ -14,7 +14,7 @@
 //! StateManager in the PICCOLO framework.
 
 use common::statemanager::{
-    connect_server, state_manager_connection_client::StateManagerConnectionClient, ResourceType,
+    connect_server, state_manager_connection_client::StateManagerConnectionClient,
     StateChange, StateChangeResponse,
 };
 use tonic::{Request, Status};
diff --git a/src/server/apiserver/src/manager.rs b/src/server/apiserver/src/manager.rs
@@ -5,11 +5,9 @@
 
 //! Controls the flow of data between each module.
 use crate::node::node_lookup::{find_guest_nodes, find_node_by_hostname, get_node_ip};
-use crate::node::NodeManager;
 use common::apiserver::api_server_connection_server::ApiServerConnectionServer;
 use common::filtergateway::{Action, HandleScenarioRequest};
 use common::nodeagent::HandleYamlRequest;
-use prost::Message;
 use tonic::transport::Server;
 
 /// Launch REST API listener, gRPC server, and reload scenario data in etcd
diff --git a/src/server/apiserver/src/node/manager.rs b/src/server/apiserver/src/node/manager.rs
@@ -5,11 +5,9 @@
 
 //! Node manager for cluster operations
 
-use base64::Engine;
 use common::apiserver::NodeInfo;
 use common::etcd;
 use common::nodeagent::{NodeRegistrationRequest, NodeStatus};
-use prost::Message;
 
 /// Node manager for handling cluster node operations
 #[derive(Clone)]
@@ -43,22 +41,18 @@ impl NodeManager {
             metadata: request.metadata,
         };
 
-        // Use prost to serialize to binary format (more efficient for etcd)
-        let mut buf = Vec::new();
-        prost::Message::encode(&node_info, &mut buf)?;
 
-        // Store in etcd as base64 encoded binary
-        let encoded = base64::engine::general_purpose::STANDARD.encode(&buf);
-        etcd::put(&node_key, &encoded).await?;
+    // 1. cluster/nodes/{hostname}: 노드 정보(json string)
+    let node_json = serde_json::to_string(&node_info)?;
+    etcd::put(&node_key, &node_json).await?;
 
-        // Also add to simple keys for quick lookup
-        // 1. IP 주소로 조회하는 키
-        let ip_key = format!("nodes/{}", request.ip_address);
-        etcd::put(&ip_key, &request.ip_address).await?;
+    // 2. nodes/{ip_address}: hostname(plain string)
+    let ip_key = format!("nodes/{}", request.ip_address);
+    etcd::put(&ip_key, &request.hostname).await?;
 
-        // 2. 호스트 이름으로 조회하는 키
-        let hostname_key = format!("nodes/{}", request.hostname);
-        etcd::put(&hostname_key, &request.ip_address).await?;
+    // 3. nodes/{hostname}: ip 주소(plain string)
+    let hostname_key = format!("nodes/{}", request.hostname);
+    etcd::put(&hostname_key, &request.ip_address).await?;
 
         println!("Node {} registered successfully", request.node_id);
         Ok(format!("cluster-token-{}", request.node_id))
@@ -73,21 +67,14 @@ impl NodeManager {
 
         let mut nodes = Vec::new();
         for kv in kvs {
-            match base64::engine::general_purpose::STANDARD.decode(&kv.value) {
-                Ok(buf) => match NodeInfo::decode(&buf[..]) {
-                    Ok(node) => nodes.push(node),
-                    Err(e) => {
-                        eprintln!("Failed to decode node data for key {}: {}", kv.key, e);
-                        continue;
-                    }
-                },
+            match serde_json::from_str::<NodeInfo>(&kv.value) {
+                Ok(node) => nodes.push(node),
                 Err(e) => {
-                    eprintln!("Failed to decode base64 for key {}: {}", kv.key, e);
+                    eprintln!("Failed to parse node json for key {}: {}", kv.key, e);
                     continue;
                 }
             }
         }
-
         Ok(nodes)
     }
 
@@ -107,9 +94,8 @@ impl NodeManager {
         let node_key = format!("cluster/nodes/{}", node_id);
 
         match etcd::get(&node_key).await {
-            Ok(encoded) => {
-                let buf = base64::engine::general_purpose::STANDARD.decode(&encoded)?;
-                let node_info = NodeInfo::decode(&buf[..])?;
+            Ok(json_str) => {
+                let node_info = serde_json::from_str::<NodeInfo>(&json_str)?;
                 Ok(Some(node_info))
             }
             Err(_) => Ok(None), // Node not found
@@ -127,14 +113,11 @@ impl NodeManager {
 
             // node_name으로 키 생성
             let node_key = format!("cluster/nodes/{}", node.hostname);
-            let mut buf = Vec::new();
-            prost::Message::encode(&node, &mut buf)?;
-            let encoded = base64::engine::general_purpose::STANDARD.encode(&buf);
-            etcd::put(&node_key, &encoded).await?;
+            let node_json = serde_json::to_string(&node)?;
+            etcd::put(&node_key, &node_json).await?;
 
             println!("Updated heartbeat for node {}", node_id);
         }
-
         Ok(())
     }
 
@@ -150,14 +133,11 @@ impl NodeManager {
 
             // node.hostname을 사용하여 키 생성 (node_id 대신)
             let node_key = format!("cluster/nodes/{}", node.hostname);
-            let mut buf = Vec::new();
-            prost::Message::encode(&node, &mut buf)?;
-            let encoded = base64::engine::general_purpose::STANDARD.encode(&buf);
-            etcd::put(&node_key, &encoded).await?;
+            let node_json = serde_json::to_string(&node)?;
+            etcd::put(&node_key, &node_json).await?;
 
             println!("Updated status for node {} to {:?}", node_id, status);
         }
-
         Ok(())
     }
 
diff --git a/src/server/apiserver/src/node/mod.rs b/src/server/apiserver/src/node/mod.rs
@@ -11,6 +11,4 @@ pub mod registry;
 pub mod status;
 
 pub use manager::NodeManager;
-pub use node_lookup::{add_node_to_simple_keys, get_node_ip};
-pub use registry::NodeRegistry;
-pub use status::{ClusterHealthSummary, ClusterStatus, NodeStatusManager};
+pub use node_lookup::get_node_ip;
diff --git a/src/server/apiserver/src/node/registry.rs b/src/server/apiserver/src/node/registry.rs
@@ -49,11 +49,10 @@ impl NodeRegistry {
     ) -> Result<ClusterTopology, Box<dyn std::error::Error + Send + Sync>> {
         let topology_key = "cluster/topology";
 
-        let mut buf = Vec::new();
-        prost::Message::encode(&topology, &mut buf)?;
-        let encoded = base64::engine::general_purpose::STANDARD.encode(&buf);
+        // 인코딩을 제거하고 json string으로 변환
+        let topology_json = serde_json::to_string(&topology)?;
 
-        etcd::put(topology_key, &encoded).await?;
+        etcd::put(topology_key, &topology_json).await?;
 
         println!("Updated cluster topology: {}", topology.cluster_name);
         Ok(topology)
