Changeset 479

Timestamp:

06/09/11 08:09:35 (13 years ago)

Author:

mafoipsl

Message:

Modification for vargas :

• add the possibility to postpone rebuild jobs when ulam is down. SUBMIT_DIR/POSTPONE directory is used to store temporary rebuild jobs.
• correct cds to stay into RUN_DIR for the end of the running job (delete of boundary files, cleaning, ...)

File:

• trunk/libIGCM/libIGCM_sys/libIGCM_sys_vargas.ksh (modified) (2 diffs)

trunk/libIGCM/libIGCM_sys/libIGCM_sys_vargas.ksh

@@ -165 +165 @@
         echo "IGCM_sys_RshPost :" $@
     fi
-    rsh ulam exec /bin/ksh ${@}
-    if [ $? -gt 0 ] ; then
-        echo "IGCM_sys_RshPost : erreur."
-        IGCM_debug_Exit "IGCM_sys_RshPost"
+
+    # keep standard input to keep it for postpone if ulam don't answer
+    cat >/tmp/tmp_IGCM_sys_RshPost_$$
+
+    ## Add submission for old postponed files only if command is a Qsub
+    ##
+    ISITQSUB=0
+    grep Qsub /tmp/tmp_IGCM_sys_RshPost_$$ >/dev/null 2>&1 && ISITQSUB=1
+    if  ( [ ${ISITQSUB} -gt 0 ] ) ; then 
+      if [ -d ${SUBMIT_DIR}/POSTPONE ] ; then
+            for postponed_file in ${SUBMIT_DIR}/POSTPONE/* ; do 
+              if [ -f ${postponed_file} ] ; then
+                IGCM_debug_Print 2 " submit postponed file : " ${postponed_file}
+                rsh ulam exec /bin/ksh <${postponed_file}
+                if [ $? -eq 0 ] ; then
+                     IGCM_sys_Rm ${postponed_file}
+                else
+                     IGCM_debug_Print 2 "keep postponed file for an other submission :" ${postponed_file}
+                fi
+              fi
+          done
+      fi
+    fi
+
+    RETURN=0
+    # rsh ulam command
+    rsh ulam exec /bin/ksh </tmp/tmp_IGCM_sys_RshPost_$$
+    RETURN=$?
+
+    # keep standard input for postpone if ulam don't answer
+    if ( [ ${RETURN} -gt 0 ] ) ; then
+        IGCM_debug_Print 2 "Postpone tmp_IGCM_sys_RshPost_$$"
+        [ -d ${SUBMIT_DIR}/POSTPONE ] || mkdir ${SUBMIT_DIR}/POSTPONE
+        mv /tmp/tmp_IGCM_sys_RshPost_$$ ${SUBMIT_DIR}/POSTPONE
     fi
     IGCM_debug_PopStack "IGCM_sys_RshPost"
@@ -469 +499 @@
     sed -e "s/\# \@ output *= .*/\# \@ output = ${Script_Output}/" -e "s/\# \@ error *= .*/\# \@ error = ${Script_Output}/" <$1 >${REP_FOR_JOB}/JOB_FOR_IGCM
     {
-      [ ${#@} = 1 ] &&  { cd $LOADL_STEP_INITDIR ; /usr/local/bin/llsubmit ${REP_FOR_JOB}/JOB_FOR_IGCM ; ERROR=$? ; cd - ; }
-      [ ${#@} = 2 ] &&  { cd $2 ; /usr/local/bin/llsubmit ${REP_FOR_JOB}/JOB_FOR_IGCM ; ERROR=$? ; cd - ; }
+       [ ${#@} = 1 ] &&  ( cd $LOADL_STEP_INITDIR ; /usr/local/bin/llsubmit JOB_FOR_IGCM ; ERROR=$? ; cd - ; )
+       [ ${#@} = 2 ] &&  ( cd $2 ; /usr/local/bin/llsubmit JOB_FOR_IGCM ; ERROR=$? ; cd - ; )
     }
     if [ ${ERROR} -gt 0 ] ; then