progress

VERSION

@@ -1 +1 @@
-2.1.4,docker prepare sim - crypto 
+2.1.7,docker prepare sim - crypto - progress 

scripts/mkt_data/sim_prepare/prepare_crypto_simdata.sh

@@ -1,11 +1,12 @@
 #!/bin/bash
 
 # --------------------- Settings
-SOURCE_HOST=cloud21.cvtt.vpn
+# SOURCE_HOST=cloud21.cvtt.vpn
-SOURCE_ROOT_DIR=/opt/store/cvtt/md_archive/crypto
+# SOURCE_ROOT_DIR=/opt/store/cvtt/md_archive/crypto
-DB_SOURCE=cloud28
+# DB_SOURCE=cloud28
-OUTPUT_DIR=/tmp
+# OUTPUT_DIR=/tmp
-DATE=20250516
+# DATE=20250516
+# RSYNC_TARGETS="cvtt@hs01.cvtt.vpn:/works/cvtt/md_archive/crypto/sim/ cvtt@cloud21.cvtt.vpn:/opt/store/cvtt/md_archive/crypto/sim/"
 # --------------------- Settings
 
 if [ -z ${DATE}  ] ; then
@@ -23,7 +24,8 @@ mkdir -p ${OUTPUT_DIR}
 year=$(date -d ${DATE} +"%Y")
 month=$(date -d ${DATE} +"%m")
 SourceDir="${SOURCE_ROOT_DIR}/${DB_SOURCE}/${year}/${month}"
-SourceFile="${SourceDir}/${DATE}.mktdata.db.gz"
+SourceFile="${DATE}.mktdata.db.gz"
+SourceFilePath="${SourceDir}/${SourceFile}"
 
 Cmd="rsync -ahv"
 Cmd+=" -e 'ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null'"
@@ -32,6 +34,10 @@ Cmd+=" $OUTPUT_DIR/"
 echo ${Cmd}
 eval ${Cmd}
 
+if [ ! -f ${OUTPUT_DIR}/${SourceFile} ] ; then
+    echo "File ${OUTPUT_DIR}/${SourceFile} NOT FOUND"
+    exit
+fi
 Cmd="(cd ${OUTPUT_DIR} && gunzip -f *.db.gz)"
 echo ${Cmd}
 eval ${Cmd}
@@ -221,22 +227,16 @@ COMMIT;
 DETACH source_db;
 EOF
 
-exit
-
 Cmd="gzip ${ResultDbFile}"
 echo ${Cmd}
 eval ${Cmd}
 
-Cmd="rsync -ahvv ${ResultDbFile}.gz "
+for tgt in ${RSYNC_TARGETS} ; do 
-echo ${Cmd}
+    Cmd="rsync -ahv"
-eval ${Cmd}
+    Cmd+=" -e 'ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null'"
-
+    Cmd+=" ${ResultDbFile}.gz ${tgt}"
-Cmd="rsync -ahvv ${ResultDbFile}.gz cvtt@cloud21.cvtt.vpn:/opt/store/cvtt/md_archive/crypto/sim/"
+    echo ${Cmd}
-echo ${Cmd}
+    eval ${Cmd}
-eval ${Cmd}
+done 
-
-Cmd="rm ${ResultDbFile}.gz"
-echo ${Cmd}
-eval ${Cmd}
 
 echo Done $0 ${*}

scripts/mkt_data/sim_prepare/prepare_eqt_simdata.sh

@@ -224,7 +224,7 @@ COMMIT;
 DETACH source_db;
 EOF
 
-    Cmd="rm ${src_hbar_db} ${src_qat_db}"
+Cmd="rm ${src_hbar_db} ${src_qat_db}"
     echo ${Cmd}
     eval ${Cmd}
 done