Changeset 1864 for TOOLS/PACK_IPSL/launch_and_measureTime.sh

Timestamp:

09/06/12 15:26:07 (12 years ago)

Author:

gpincka

Message:

gestion (a ameliorer) des echecs ncrcat + check automatiques et aleatoires + resolution bug sur outil visu avancement + suppr liste 'manquant' vides

File:

• TOOLS/PACK_IPSL/launch_and_measureTime.sh (modified) (5 diffs)

TOOLS/PACK_IPSL/launch_and_measureTime.sh

@@ -35 +35 @@
                echo "./process_list.sh $newCmdToPrint" >> ${tasksListFile}
            ;;
+           x50)
+               # ne fait rien, la liste, au depart a concatener, a ete taree 
+               # car echec de la concatenation  
+           ;;
            *)
                echo "./process_list.sh $cmdToPrint" >> ${tasksListFile}
@@ -61 +65 @@
  
    done
-   IFS=$old_IFS     # rétablissement du séparateur de champ par défaut     
+   IFS=$old_IFS     # rétablissement du séparateur de champ par défaut
+   
+   # Il peut arriver que 2 listes soient identiques, on empeche ce cas
+   cat ${tasksListFile} | sort | uniq > taskFile.txt
+   cat taskFile.txt > ${tasksListFile}  
 
 }
@@ -172 +180 @@
 }
 
+export RANDOM=$$ # random seed
+function gives_random_number
+{
+   lim=$1
+   bit=-1
+   let "bit = RANDOM % $lim"
+   bit=$(( $bit + 1 )) # nb entre 1 et $limit
+   echo $bit
+}
+
 ########## batch directives : begin ##########
 #MSUB -r pack_ipsl          # Nom du job                
@@ -206 +224 @@
 export output="${progressDir}/packOutput__try__${numCurrentTry}__instance__${numNewInstance}.log"
 export reportFile="${progressDir}/report__try__${numCurrentTry}__instance__${numNewInstance}.log"
-
+export checkFile="${progressDir}/check__try__${numCurrentTry}__instance__${numNewInstance}.log"
+export checkFileTmp="checkTmp__try__${numCurrentTry}__instance__${numNewInstance}.txt"
 
 export noInterruptFile="${progressDir}/noInterrupt__try__${numCurrentTry}__instance__${numNewInstance}.txt"
@@ -349 +368 @@
 update_tasks_list $nextInputCmd $output $inputCmd
 
+# Verifications sur qq listes (dont le traitement semble correct) :
+# ----------------------------------------------------------------------------------------
+if [ "x${nbListsToCheck}" == "x" ]
+then
+    echo "nbre de listes a checker absent" >> $checkFile
+    echo "nbre de listes a checker absent" >> $badFailureFile
+    exit 1
+fi
+> $checkFileTmp
+# ensemble des listes concatenees correctement
+set_of_good_lists=`cat $output | grep -e '^#executed by process' | awk '{ if ($9==0){print $12} }' | grep "output_ncrcat" `
+
+# envoi des cmds de check dans fichier tmp
+for lst in $set_of_good_lists
+do
+   echo "./check_ncrcat_list.sh $lst" >> $checkFileTmp
+done
+
+# nombre de listes concatenees correctement
+nb_of_good_lists=`cat $checkFileTmp | wc -l `
+
+# le nb de listes a checker ne peut exceder le nb de listes disponibles pour le check
+if [ $nbListsToCheck -ge $nb_of_good_lists ]
+then
+    nbListsToCheck=$nb_of_good_lists
+fi
+nbLstToCheck_tmp=$nbListsToCheck
+
+while [ $nbLstToCheck_tmp -gt 0 ]
+do
+    random_number=$( gives_random_number $nbLstToCheck_tmp ) # nb aleatoire entre 1 et $nbLstToCheck_tmp
+    checkCmd=`sed -n "${random_number}p" $checkFileTmp `
+    $checkCmd # on envoie la cmd de check
+    resCmd=$?
+    if [ "x${resCmd}" != "x0" ]
+    then
+        echo "$checkCmd ==> not OK ==> stop everything." >> $checkFile
+        echo "$checkCmd ==> not OK ==> stop everything." >> $badFailureFile
+        # exit 1 # a retablir
+    else
+        echo "$checkCmd ==> OK" >> $checkFile
+    fi
+    sed -i "${random_number}d" $checkFileTmp # on retire la cmd qui vient d'etre effectuee du fichier tmp
+    nbLstToCheck_tmp=$(( $nbLstToCheck_tmp - 1 ))
+done
+
+
+rm $checkFileTmp
+# ----- Fin verif ------------------------------------------------------------------------
+
 echo "no interruption has occured" > ${noInterruptFile}
+
+# exit 0 # a virer
 
 # Tout s'est bien passe
 # ----------------------
 everythingOK=`cat $nextInputCmd | wc -l `
-if [ "x${everythingOK}" == "x0"]
+if [ "x${everythingOK}" == "x0" ]
 then
     echo "Tout s'est fini correctement" >> $badFailureFile
-    exit 1
+    exit 0
 fi