header增加dag_run_id字段，进行集成测试

L1/dockerfiles/csst-msc-l1-mbi/run.sh

@@ -26,9 +26,21 @@ if test -f "$timefile"; then
     mv /pipeline/output/timestamp.txt /work/timestamps.txt
 fi
 
+
+headers=$2
+pattern='"dag_run_id":"([^"]+)"'
+if [[ $headers =~ $pattern ]]; then
+    dag_run_id="${BASH_REMATCH[1]}"
+    echo "dag_run_id: $dag_run_id"
+else
+    # no dag_run_id in json
+    dag_run_id=""
+fi
+
 if [ $exit_code -eq 0 ]; then  
   echo "finish mbi, start sink-job."  
-  scalebox task add $1
+  scalebox task add --header dag_run_id=${dag_run_id} "$1"
+  # scalebox task add $1
 else  
   echo "finish mbi, exit_code: $exit_code"  
 fi

L1/dockerfiles/csst-msc-l1-qc0/run.sh

@@ -28,8 +28,18 @@ fi
 
 rm -rf /pipeline/input/* /pipeline/output/*
 
+headers=$2
+pattern='"dag_run_id":"([^"]+)"'
+if [[ $headers =~ $pattern ]]; then
+    dag_run_id="${BASH_REMATCH[1]}"
+    echo "dag_run_id: $dag_run_id"
+else
+    # no dag_run_id in json
+    dag_run_id=""
+fi
+
 if [ $exit_code -eq 0 ]; then  
-    scalebox task add $1
+    scalebox task add --header dag_run_id=${dag_run_id} "$1"
     echo "finish qc0, start sink-job."  
 else  
     echo "finish qc0, exit_code: $exit_code"  

L1/dockerfiles/redis-cli/Dockerfile

@@ -16,4 +16,4 @@ COPY --from=hub.cstcloud.cn/scalebox/agent /usr/local /usr/local
 COPY *.sh /app/bin/
 RUN chmod +x /app/bin/*.sh
 
-CMD run.sh
+CMD /app/bin/run.sh

L1/dockerfiles/redis-cli/Makefile

@@ -9,8 +9,8 @@ dist:
 push:
 	docker push $(IMAGE_NAME)
 run-bash:
-	docker run -it --entrypoint bash -e GRPC_SERVER=10.3.10.28 -v ${PWD}/config:/config $(IMAGE_NAME)
+	docker run -it --entrypoint bash -e PGHOST=10.3.10.28:9090 -e GRPC_SERVER=10.3.10.28 -v ${PWD}/config:/config $(IMAGE_NAME)
 run:
-	docker run -d --entrypoint -e GRPC_SERVER=10.3.10.28 -v ${PWD}/config:/config $(IMAGE_NAME)
+	docker run -d -e PGHOST=10.3.10.28:9090 -e GRPC_SERVER=10.3.10.28 -v ${PWD}/config:/config $(IMAGE_NAME)
 down:
 	docker stop $(IMAGE_NAME)

L1/dockerfiles/redis-cli/config/appconfig.txt

-202411111841239406 9
+csst-msc-l1-mbi 9
\ No newline at end of file

L1/dockerfiles/redis-cli/run.sh

@@ -5,34 +5,35 @@
 while true
 do
     # obsid=$(redis-cli -h ${REDIS_SERVER} -p ${REDIS_PORT} rpop single-image-reduction:obsid)
-    # msg=$(redis-cli -h ${REDIS_SERVER} -p ${REDIS_PORT} -a ${REDIS_PWD} rpop csst_data_list)
-    msg=$(redis-cli -h 10.3.10.28 -a 123456 lpop csst_data_list_zxl)
+    msg=$(redis-cli -h ${REDIS_SERVER} -p ${REDIS_PORT} -a ${REDIS_PWD} rpop csst_data_list)
+    # msg=$(redis-cli -h 10.3.10.28 -a 123456 lpop csst_data_list_zxl)
     #redis-cli -h 10.3.10.28 -p 26379 -a "csst__2025" rpop csst_data_list
     echo "msg : "$msg
 
     if [ -z "$msg" ]; then
         echo "msg is empty"
-        exit 102
+        code = 102
     else
         echo "msg is not empty" $msg
-        # 提取dag_id 模块名
-        app_name=$(echo "$msg" | jq -r '.dag_id')
-        echo "app_name : "$app_name
-
-        # 提取dag_run_id 对应app_id
-        dag_run_id=$(echo "$msg" | jq -r '.parameters.dag_run_id')
-        echo "dag_run_id : "$dag_run_id
-        #检索dag_run_id与app_id对应关系的配置文件appconfig.txt
-        app_id=$(awk -v key="$dag_run_id" '$1 == key {print $2}' /config/appconfig.txt)
+        # 提取dag_id 对应app_id
+        dag_id=$(echo "$msg" | jq -r '.dag_id')
+        echo "dag_id : "$dag_id
+        #检索dag_id与app_id对应关系的配置文件appconfig.txt
+        app_id=$(awk -v key="$dag_id" '$1 == key {print $2}' /config/appconfig.txt)
     
         # 检查是否找到app_id
         if [ -n "$app_id" ]; then
-            echo "The appid for $dag_run_id is $app_id"
+            echo "The appid for $dag_id is $app_id"
         else
-            echo "$dag_run_id not found in appconfig.txt"
-            exit 103
+            echo "$dag_id not found in appconfig.txt"
+            code = 103
+            # exit 103
         fi
 
+        # 提取dag_run_id
+        dag_run_id=$(echo "$msg" | jq -r '.parameters.dag_run_id')
+        echo "dag_run_id : "$dag_run_id
+
         # 提取obsid
         obsid=$(echo "$msg" | jq -r '.parameters.message.obsid')
         echo "obsid :"$obsid
@@ -47,12 +48,9 @@ do
 
         #send-message $obsid
         job_name="message-router-csst"
-        scalebox task add --app-id ${app_id} --sink-job ${job_name} ${message}
+        scalebox task add --app-id ${app_id} --header dag_run_id=${dag_run_id} --sink-job ${job_name} ${message}
         code=$?
-        #code值不为0时，退出
-        if [ $code -ne 0 ]; then
-            exit $code
-        fi
+
     fi
     echo $code
 done
\ No newline at end of file

L1/pipelines/csst-msc-l1-mbi/app.yaml

@@ -63,7 +63,7 @@ jobs:
     sink_vjobs:
       - csst-msc-l1-mbi
     hosts:
-      - h0:1      
+      - h0:1   
   csst-msc-l1-mbi:
     label: 多色成像
     base_image: cnic/csst-msc-l1-mbi
@@ -95,8 +95,8 @@ jobs:
     sink_vjobs:
       - csst-msc-l1-mbi-photmix    
     hosts:
-      - h0:1
-      # - c0:10
+      # - h0:10
+      - c0:20
       # - c1:1
       # - c2:1  
   csst-msc-l1-mbi-photmix:
@@ -128,7 +128,7 @@ jobs:
       - ${CSST_AST_TEMP}:/pipeline/temp
     # command: docker run -d --network=host %ENVS% %VOLUMES% %IMAGE%
     hosts:
-      - h0:1
+      - h0:10
       # - c0:10
       # - c1:1
       # - c2:1