Changeset 1076

Timestamp:

10/01/14 11:54:19 (10 years ago)

Author:

sdipsl

Message:

• Have smaller message, except the very first one
• stack files will go in ${SUBMIT_DIR}/STACK directory. Just for debug...
• Comments and cosmetics

Location:

trunk/libIGCM

Files:

• libIGCM_config/libIGCM_config.ksh (modified) (3 diffs)
• libIGCM_debug/libIGCM_debug.ksh (modified) (11 diffs)

trunk/libIGCM/libIGCM_config/libIGCM_config.ksh

@@ -1219 +1219 @@
   echo
 
-  if ( $DEBUG_debug ) ; then
-    # Inform the rabbitMQ queue
-    if [ X${ActivateBigBro} = Xtrue ] ; then
-      # RabbitMQ message code
-      code=1100
-      # RabbitMQ message body
-      Body=$( echo "{${genericSimulationID},\"msgCode\":\"${code}\",\"msgUID\":\"$(uuidgen)\",\"msgTimestamp\":\"$( date +"%Y-%m-%dT%H:%M:%S.%N%z" )\"}" )
-      # Fill the rabbitMQ queue
-      IGCM_debug_sendAMQP
-    fi
-  fi
-
   if [ ${SimulationLengthInDays} -ge ${ExperienceLengthInDays} ] ; then
     #==========================#
@@ -1245 +1233 @@
     if ( $DEBUG_debug ) ; then
       if [ X${ActivateBigBro} = Xtrue ] ; then
-        # RabbitMQ message code
+        # RabbitMQ message code "END OF SIMULATION"
         code=0100
         # RabbitMQ message body
@@ -1292 +1280 @@
   [ X${JobType} = XRUN ] && IGCM_sys_RmRunDir -rf ${RUN_DIR_PATH}
 
+  if ( $DEBUG_debug ) ; then
+    # Inform the rabbitMQ queue
+    if [ X${ActivateBigBro} = Xtrue ] ; then
+      # RabbitMQ message code "WAITING"
+      code=1100
+      # RabbitMQ message body
+      Body=$( echo "{${genericSimulationID},\"msgCode\":\"${code}\",\"msgUID\":\"$(uuidgen)\",\"msgTimestamp\":\"$( date +"%Y-%m-%dT%H:%M:%S.%N%z" )\"}" )
+      # Fill the rabbitMQ queue
+      IGCM_debug_sendAMQP
+    fi
+  fi
+
   # To be sure we flush message buffer before exiting the job
   FlushAMQP=TRUE

trunk/libIGCM/libIGCM_debug/libIGCM_debug.ksh

@@ -34 +34 @@
 if ( $DEBUG_debug ) ; then
   if [ X${TaskType} = Xcomputing ]; then
-    typeset StackFileLocation=${StackFileLocation:=${PWD}}
+    typeset StackFileLocation=${StackFileLocation:=${PWD}/STACK}
     typeset StackFileName=computing.stack.$$
+    [ ! -d ${StackFileLocation} ] && mkdir -p ${StackFileLocation}
   elif [ X${TaskType} = Xpost-processing ]; then
     typeset StackFileLocation=${POST_DIR:=${StackFileLocation}}
@@ -150 +151 @@
 
   typeset b64_encoded_msg mail_recipient
-  typeset buffer send_messages mail_frequency 
+  typeset buffer send_messages mail_frequency
   typeset last_mail_date__file
 
@@ -160 +161 @@
   mail_frequency=3600 # in seconds
   # use to keep track when was last mail sent (maybe to be replaced with global variable)
-  last_mail_date__file=/tmp/stamp.$$ 
+  last_mail_date__file=/tmp/stamp.$$
 
   # init
@@ -217 +218 @@
     # Prepare additionnal option
     additionnalOption="-f ${SUBMIT_DIR}/config.card.base64"
-    # 
+    #
     initBigBro=true
   else
@@ -316 +317 @@
 
     if [ X${ActivateBigBro} = Xtrue ] ; then
-      # RabbitMQ message code
+      # RabbitMQ message code "PUSHSTACK"
       code=2000
       # RabbitMQ message body
@@ -511 +512 @@
 
       if [ X${ActivateBigBro} = Xtrue ] ; then
-        # RabbitMQ message code
+        # RabbitMQ message code "ERROR HAS BEEN TRIGGERED"
         code=9000
         # RabbitMQ message body
@@ -522 +523 @@
       echo "< ${IGCM_debug_LenStack} : ${@}" >> ${StackFileLocation}/${StackFileName}
       if [ X${ActivateBigBro} = Xtrue ] ; then
-        # RabbitMQ message code
+        # RabbitMQ message code "POPSTACK"
         code=3000
         # RabbitMQ message body
@@ -564 +565 @@
     jobuid=$(uuidgen)
 
-    # RabbitMQ message code
     if ( ${FirstInitialize} ) ; then
+      # RabbitMQ message code "BEGIN A SIMULATION"
       code=0000
       # create and persist a unique id for this simulation
@@ -574 +575 @@
       genericSimulationID=$( echo "\"msgApplication\":\"monitoring\",\"msgProducer\":\"libigcm\",\"activity\":\"IPSL\",\"name\":\"${config_UserChoices_JobName}\",\"cumulPeriod\":\"${CumulPeriod}\",\"experiment\":\"${config_UserChoices_ExperimentName}\",\"space\":\"${config_UserChoices_SpaceName}\",\"model\":\"${config_UserChoices_TagName}\",\"startDate\":\"${config_UserChoices_DateBegin}\",\"endDate\":\"${config_UserChoices_DateEnd}\",\"login\":\"${LOGIN}\",\"centre\":\"${CENTER}\",\"machine\":\"${MASTER}\",\"simuid\":\"${simuid}\",\"jobuid\":\"${jobuid}\"" )
     else
+      # RabbitMQ message code "A NEW JOB IS RUNNING PART OF A SIMULATION"
       code=1000
       #
-      # retrieve this simulation's unique id 
+      # retrieve this simulation's unique id
       IGCM_card_DefineVariableFromOption ${SUBMIT_DIR}/run.card Configuration simuid
       simuid=${config_Configuration_simuid}
 
-      # Standard fields for message others than the first one. Still subject to change
+      # Using standard fields for message others than the first one. Still subject to change
       genericSimulationID=$( echo "\"msgApplication\":\"monitoring\",\"msgProducer\":\"libigcm\",\"cumulPeriod\":\"${CumulPeriod}\",\"simuid\":\"${simuid}\",\"jobuid\":\"${jobuid}\"" )
     fi
@@ -586 +588 @@
     # RabbitMQ message body with specific fields associated message codes treated here
     Body=$( echo "{${genericSimulationID},\"msgCode\":\"${code}\",\"msgUID\":\"$(uuidgen)\",\"msgTimestamp\":\"$( date +"%Y-%m-%dT%H:%M:%S.%N%z" )\"}" )
-    # Fill the rabbitMQ queue (specifying config.card must be send)
+
+    # Fill the rabbitMQ queue (the config.card in use will be sent)
     IGCM_debug_sendAMQP activate
+
+    # NOT VERY NICE BUT ... IT WORKS
+    # Be sure that the genericSimulationID will be small from now on
+    # Using standard fields for messages others than the first one. Still subject to change
+    genericSimulationID=$( echo "\"msgApplication\":\"monitoring\",\"msgProducer\":\"libigcm\",\"cumulPeriod\":\"${CumulPeriod}\",\"simuid\":\"${simuid}\",\"jobuid\":\"${jobuid}\"" )
 
     # Turn the flag on
@@ -630 +638 @@
 
     if [ X${ActivateBigBro} = Xtrue ] ; then
-      # RabbitMQ message code
+      # RabbitMQ message code "EXIT THE JOBS BECAUSE ERROR(S) HAS BEEN TRIGGERED"
       code=9999
       # RabbitMQ message body