Changeset 1899

Timestamp:

10/18/12 17:52:26 (12 years ago)

Author:

aclsce

Message:

Added what is needed to use monitoring.

Location:

TOOLS/PACK_IPSL

Files:

• monit_header.txt (added)
• monitoring.sh (added)
• showPackProgress.sh (modified) (9 diffs)

TOOLS/PACK_IPSL/showPackProgress.sh

@@ -225 +225 @@
      
      listName=`echo $(basename $set) | sed 's;\.list$;;' | sed 's;\.nc$;;' `
-     ListNbInode=`cat $set | wc -l`
-#     TotalNbInodes=$(( $TotalNbInodes + $ListNbInode ))
+
      statusfile=${set%%.list}.status
      status=$( progressStatus $statusfile ) # gpdebug : a retablir
      timeTaken="???"
-  
+
+     if [ -e ${statusfile} ]
+     then
+         for file in `awk '{print $0}' $set` ; do
+         if [[ "$listName" == *"_restart_"* ]] || [[ "$listName" == *"_debug_"* ]] 
+         then
+             file_tmp=$( echo $file | cut -c 5- )
+         else
+             file_tmp=$file
+         fi
+         grep -v $file_tmp ${IGCM_DEM}/Listing_progress.txt > ${IGCM_DEM}/Listing_progress_tmp.txt
+         mv ${IGCM_DEM}/Listing_progress_tmp.txt ${IGCM_DEM}/Listing_progress.txt
+         done
+     fi
+
      packFailed=`echo $status | grep -E '(DELEGATE|FAILED)' | wc -l `
      if [ "x${packFailed}" != "x0" ]
@@ -272 +285 @@
 focusOnSimu=
 outputFile=
+outputFile_simus=
 detailed_mode=1
 publish_mode=1
@@ -303 +317 @@
                      ;;
    -p) echo "option -p selectionnee : publication"
-       publish_mode=0      
+       publish_mode=0
+       outputFile="monit_${USER}.txt"
+       outputFile_simus="${USER}_SIMUS/monit_${USER}_simus.txt"
+       if [ -d ${USER}_SIMUS ]
+       then
+           rm -f ${USER}_SIMUS/*
+       else
+           mkdir -p ${USER}_SIMUS
+       fi
+       echo "Simulation;Status" > ${outputFile_simus}
    esac
    shift
@@ -351 +374 @@
 nbOfListsFailed=0
 nbOfListsNottreated=0
-#TotalNbInodes=0
+TotalNbInodes=0
 TotalSimuTar=0
 totalTime=0
-
+cp ${IGCM_DEM}/Listing.txt ${IGCM_DEM}/Listing_progress.txt
 TotalNbSimu=`cat ${IGCM_DEM}/config_card.liste |wc -l`
 
@@ -459 +482 @@
         else
 # Publication
-        echo "$simuName;$resSimu" >> ${outputFile}_${USER}
+            echo "$simuName;$resSimu" >> ${outputFile_simus}
+            if [ "x${resSimu}" == "xnot OK" ]
+            then
+                simuName_modif=$( echo $simuName | sed s%"/"%"_"%g )
+                cat simuPrint.txt $outRedirectStatemen > ${USER}_SIMUS/${simuName_modif}".log"
+            fi
         fi
     fi 
@@ -465 +493 @@
 done
 
-NbInodeBefore=`cat ${IGCM_DEM}/Listing.txt |wc -l`
-# find $IGCM_DEM -printf "%y %s %p \n" >> ${IGCM_DEM}/ListingEnd.txt
-rm -f ${IGCM_DEM}/ListingEnd.txt
+NbInodeBefore=`cat ${IGCM_DEM}/Listing.txt | grep "f " | wc -l`
+#NbInodeBefore=`cat ${IGCM_DEM}/Listing.txt  | wc -l`
  if [ -d "${OUTPUT_STORE}" ]
  then
-     find $OUTPUT_STORE -printf "%y %s %p \n" >> ${IGCM_DEM}/ListingEnd.txt
+     NbInodeAfterStore=$( find $OUTPUT_STORE -type f -printf "%y %s %p \n" | wc -l )
  fi
  if [ -d "${OUTPUT_WORK}" ]
  then
-     find $OUTPUT_WORK -printf "%y %s %p \n" >> ${IGCM_DEM}/ListingEnd.txt
+     NbInodeAfterWork=$( find $OUTPUT_WORK -type f -printf "%y %s %p \n" | wc -l )
  fi
 
-if [ -e ${IGCM_DEM}/ListingEnd.txt ]
-then 
-    NbInodeAfter=`cat ${IGCM_DEM}/ListingEnd.txt |wc -l`
+# NbInodeAfter=`cat ${IGCM_DEM}/ListingEnd.txt | grep "f " | wc -l`
+ NbInodeAfter=$(( $NbInodeAfterStore + $NbInodeAfterWork ))
+
+if [ -e ${IGCM_DEM}/Listing_progress.txt ]
+then
+    NbInodesprogressed=`cat ${IGCM_DEM}/Listing_progress.txt | grep "f " | wc -l`
+#    NbInodesprogressed=`cat ${IGCM_DEM}/Listing_progress.txt | wc -l`
 fi
+TotalNbInodes=$(( $NbInodeBefore - $NbInodesprogressed ))
+
 
 if [ "x${outputFile}" == "x" ]
@@ -494 +527 @@
     echo "nb of fails : $nbOfListsFailed"
     echo "nb of not treated : ${nbOfListsNottreated}"
-#    echo "nb of inodes packed : $TotalNbInodes"
+    echo "nb of inodes packed : $TotalNbInodes"
     echo "nb simul full tared : $TotalSimuTar"
     echo "nb inode before : $NbInodeBefore"
-    echo "nb inode after : $NbInodeAfter"
+    echo "nb inode after WORK : $NbInodeAfterWork"
+    echo "nb inode after STORE : $NbInodeAfterStore"
     echo "Total time for elementary operations : $totalTime" 
     echo "Time since launch start : $timeSinceLaunchStart"
@@ -514 +548 @@
     echo "nb of fails : $nbOfListsFailed" >> ${outputFile}
     echo "nb of not treated : ${nbOfListsNottreated}" >> ${outputFile}
-#    echo "nb of inodes packed : $TotalNbInodes" >> ${outputFile}
+    echo "nb of inodes packed : $TotalNbInodes" >> ${outputFile}
     echo "nb simul full tared : $TotalSimuTar" >> ${outputFile}
     echo "nb inode before : $NbInodeBefore" >> ${outputFile}
@@ -522 +556 @@
     else
 # Publication
-    echo "User;TotalNbSimu;NbOfSimuPacked;NbOfSimuFailed;NbOfSimuNottreated;TotalNbOfList;NbOfListsPacked;NbOfListsFailed;NbOfListsNottreated;TotalNbFiles;Nbfilesafter;NbSimuTar" > ${outputFile}
-    echo "${USER};${TotalNbSimu};${nbOfSimuPacked};${nbOfSimuFailed};${nbOfSimuNottreated};${totalNbOfList};${nbOfListsPacked};$nbOfListsFailed;${nbOfListsNottreated};$NbInodeBefore;$NbInodeAfter;$TotalSimuTar" >> ${outputFile}
+    echo "User;Inode NB;Inode Processed;Inode Treatment Percentage;Inode After;Inode store;Inode percentage STORE-WORK;Simu NB;Simu OK; Simu FAILED;Simu Percentage;List NB;List OK;List FAILED;List Percentage" > ${outputFile}
+        echo "${USER};$NbInodeBefore;$TotalNbInodes;PIE2;$NbInodeAfter;$NbInodeAfterStore;PIE2;${TotalNbSimu};${nbOfSimuPacked};${nbOfSimuFailed};PIE3;${totalNbOfList};${nbOfListsPacked};$nbOfListsFailed;PIE3" >> ${outputFile}
     fi
 fi