From ca9f6ed15d82ea3cdd281482f232144bffe1720b Mon Sep 17 00:00:00 2001
From: zxl <zhangxiaoli@cnic.cn>
Date: Fri, 20 Dec 2024 14:28:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20--header=20repeatable=3Dye?=
 =?UTF-8?q?s=20=E5=8F=AF=E4=BF=AE=E6=94=B9=E6=AD=A3=E5=9C=A8=E8=BF=90?=
 =?UTF-8?q?=E8=A1=8C=E7=9A=84task=E7=8A=B6=E6=80=81=EF=BC=8C=E4=BD=BF?=
 =?UTF-8?q?=E5=85=B6=E9=87=8D=E6=96=B0=E6=89=A7=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 L1/dockerfiles/csst-msc-l1-mbi-photmix/run.sh | 20 +++++++++++++++++--
 L1/dockerfiles/csst-msc-l1-mbi/run.sh         |  4 +++-
 L1/dockerfiles/csst-msc-l1-qc0/run.sh         |  5 +++--
 3 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/L1/dockerfiles/csst-msc-l1-mbi-photmix/run.sh b/L1/dockerfiles/csst-msc-l1-mbi-photmix/run.sh
index 8ab205a..893463d 100644
--- a/L1/dockerfiles/csst-msc-l1-mbi-photmix/run.sh
+++ b/L1/dockerfiles/csst-msc-l1-mbi-photmix/run.sh
@@ -22,8 +22,24 @@ if test -f "$timefile"; then
     mv /pipeline/output/timestamp.txt /work/timestamps.txt
 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
 
-echo finish photmix.
+echo "dag_run_id:$dag_run_id" >> /work/extra-attributes.txt
+if [ $exit_code -eq 0 ]; then  
+  echo finish photmix.
+  # scalebox task add $1
+else  
+  echo "finish photmix, exit_code: $exit_code"  
+fi
+
+rm -rf /pipeline/input/* /pipeline/output/*
 
 exit $exit_code
diff --git a/L1/dockerfiles/csst-msc-l1-mbi/run.sh b/L1/dockerfiles/csst-msc-l1-mbi/run.sh
index d16def2..11bc82c 100644
--- a/L1/dockerfiles/csst-msc-l1-mbi/run.sh
+++ b/L1/dockerfiles/csst-msc-l1-mbi/run.sh
@@ -33,9 +33,11 @@ else
     dag_run_id=""
 fi
 
+echo "dag_run_id:$dag_run_id" >> /work/extra-attributes.txt
+
 if [ $exit_code -eq 0 ]; then  
   echo "finish mbi, start sink-job."  
-  scalebox task add --header dag_run_id=${dag_run_id} --upsert ${message}
+  scalebox task add --header dag_run_id=${dag_run_id} --header repeatable=yes --upsert ${message}
   # scalebox task add $1
 else  
   echo "finish mbi, exit_code: $exit_code"  
diff --git a/L1/dockerfiles/csst-msc-l1-qc0/run.sh b/L1/dockerfiles/csst-msc-l1-qc0/run.sh
index b94a75c..d5cdeee 100644
--- a/L1/dockerfiles/csst-msc-l1-qc0/run.sh
+++ b/L1/dockerfiles/csst-msc-l1-qc0/run.sh
@@ -34,9 +34,10 @@ else
     dag_run_id=""
 fi
 
-if [ $exit_code -eq 0 ]; then  
-    scalebox task add --header dag_run_id=${dag_run_id} --upsert ${message}
+echo "dag_run_id:$dag_run_id" >> /work/extra-attributes.txt
 
+if [ $exit_code -eq 0 ]; then  
+    scalebox task add --header dag_run_id=${dag_run_id} --header repeatable=yes --upsert ${message}
     echo "finish qc0, start sink-job."  
 else  
     echo "finish qc0, exit_code: $exit_code"  
-- 
GitLab