chore: rename type and package

.github/workflows/rust.yml

@@ -16,7 +16,12 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
+
+    - name: Start minikube
+      uses: medyagh/setup-minikube@latest
+
     - name: Build
       run: cargo build --verbose
+
     - name: Run tests
       run: cargo test --verbose

Cargo.toml

@@ -1,7 +1,7 @@
 [workspace]
 members = [
   "runner/dp_runner",
-  "runner/compute_data_runner",
+  "runner/compute_unit_runner",
 ]
 
 [workspace.package]

makefile

@@ -4,8 +4,8 @@ $(OUTPUT):
 	mkdir -p $(OUTPUT)
 
 build-cd: $(OUTPUT)
-	cargo build -p compute_data_runner --release
-	cp target/release/compute_data_runner $(OUTPUT)/compute_data_runner
+	cargo build -p compute_unit_runner --release
+	cp target/release/compute_unit_runner $(OUTPUT)/compute_unit_runner
 
 build-dp: $(OUTPUT)
 	cargo build -p dp_runner --release
@@ -15,7 +15,7 @@ build: build-cd build-dp
 	cargo build --release
 
 docker_cd: build-cd
-	docker build -f ./script/cd.dockerfile -t jz-action/compute_data_runner:latest .
+	docker build -f ./script/cd.dockerfile -t jz-action/compute_unit_runner:latest .
 
 docker_dp: build-dp
 	docker build -f ./script/dp.dockerfile -t jz-action/dp_runner:latest .
@@ -27,7 +27,7 @@ minikube-env:
 	@eval $(minikube -p minikube docker-env)
 
 minikube-docker: minikube-env docker
-	docker push jz-action/compute_data_runner:latest
+	docker push jz-action/compute_unit_runner:latest
 	docker push jz-action/dp_runner:latest
 
 clean:

runner/compute_data_runner/Cargo.toml → runner/compute_unit_runner/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "compute_data_runner"
+name = "compute_unit_runner"
 version = "0.1.0"
 edition = "2021"
 

runner/compute_data_runner/src/ipc.rs → runner/compute_unit_runner/src/ipc.rs

@@ -1,8 +1,6 @@
-use anyhow::Result;
-
+use crate::media_data_tracker::MediaDataTracker;
 use actix_web::{web, App, HttpResponse, HttpServer};
-
-use crate::program::BatchProgram;
+use anyhow::Result;
 use serde::{Deserialize, Serialize};
 use std::sync::Arc;
 use tokio::sync::oneshot;
@@ -18,7 +16,9 @@ pub(crate) struct SubmitResultReq {
     pub(crate) id: String,
 }
 
-async fn process_data_request(program_mutex: web::Data<Arc<Mutex<BatchProgram>>>) -> HttpResponse {
+async fn process_data_request(
+    program_mutex: web::Data<Arc<Mutex<MediaDataTracker>>>,
+) -> HttpResponse {
     let (tx, mut rx) = oneshot::channel::<DataResponse>();
     let program = program_mutex.lock().await;
     program
@@ -36,7 +36,7 @@ async fn process_data_request(program_mutex: web::Data<Arc<Mutex<BatchProgram>>>
 }
 
 async fn process_submit_result_request(
-    program_mutex: web::Data<Arc<Mutex<BatchProgram>>>,
+    program_mutex: web::Data<Arc<Mutex<MediaDataTracker>>>,
     data: web::Json<SubmitResultReq>,
 ) -> HttpResponse {
     let (tx, mut rx) = oneshot::channel::<()>();
@@ -60,7 +60,7 @@ async fn process_submit_result_request(
 
 pub(crate) fn start_ipc_server(
     unix_socket_addr: String,
-    program: Arc<Mutex<BatchProgram>>,
+    program: Arc<Mutex<MediaDataTracker>>,
 ) -> Result<()> {
     HttpServer::new(move || {
         App::new()

runner/compute_data_runner/src/main.rs → runner/compute_unit_runner/src/main.rs

@@ -1,7 +1,7 @@
 #![feature(future_join)]
 
 mod ipc;
-mod program;
+mod media_data_tracker;
 mod unit;
 
 use jz_action::network::datatransfer::data_stream_server::DataStreamServer;
@@ -10,7 +10,7 @@ use jz_action::utils::StdIntoAnyhowResult;
 
 use anyhow::{anyhow, Result};
 use clap::Parser;
-use program::BatchProgram;
+use media_data_tracker::MediaDataTracker;
 use std::path::PathBuf;
 use std::str::FromStr;
 use std::sync::Arc;
@@ -25,7 +25,7 @@ use unit::UnitDataStream;
 
 #[derive(Debug, Parser)]
 #[command(
-    name = "compute_runner",
+    name = "compute_unit_runner",
     version = "0.0.1",
     author = "Author Name <github.com/GitDataAI/jz-action>",
     about = "embed in k8s images"
@@ -37,7 +37,7 @@ struct Args {
     #[arg(short, long, default_value = "/app/tmp")]
     tmp_path: String,
 
-    #[arg(short, long, default_value = "/unix_socket/compute_data_runner_d")]
+    #[arg(short, long, default_value = "/unix_socket/compute_unit_runner_d")]
     unix_socket_addr: String,
 
     #[arg(long, default_value = "[::1]:25431")]
@@ -53,10 +53,9 @@ async fn main() -> Result<()> {
         .anyhow()?;
 
     let addr = args.host_port.parse()?;
-    let program = BatchProgram::new(PathBuf::from_str(args.tmp_path.as_str())?);
+    let program = MediaDataTracker::new(PathBuf::from_str(args.tmp_path.as_str())?);
     let program_safe = Arc::new(Mutex::new(program));
 
-
     let node_controller = DataNodeControllerServer {
         program: program_safe.clone(),
     };
@@ -77,7 +76,9 @@ async fn main() -> Result<()> {
                 .await
                 .anyhow()
             {
-                let _ = shutdown_tx_arc.send(Err(anyhow!("start data controller {e}"))).await;
+                let _ = shutdown_tx_arc
+                    .send(Err(anyhow!("start data controller {e}")))
+                    .await;
             }
         });
 
@@ -90,8 +91,10 @@ async fn main() -> Result<()> {
         let program = program_safe.clone();
         let shutdown_tx_arc = shutdown_tx.clone();
         let _ = tokio::spawn(async move {
-            if let Err(e) = ipc::start_ipc_server(unix_socket_addr, program)  {
-                let _ = shutdown_tx_arc.send(Err(anyhow!("start unix socket server {e}"))).await;
+            if let Err(e) = ipc::start_ipc_server(unix_socket_addr, program) {
+                let _ = shutdown_tx_arc
+                    .send(Err(anyhow!("start unix socket server {e}")))
+                    .await;
             }
         });
     }