Changeset 481

Timestamp:

06/09/11 10:22:34 (13 years ago)

Author:

mafoipsl

Message:

Modification for brodie (copied from vargas and not tested yet) :

• add the possibility to postpone rebuild jobs when ulam is down. SUBMIT_DIR/POSTPONE directory is used to store temporary rebuild jobs.

File:

• trunk/libIGCM/libIGCM_sys/libIGCM_sys_brodie.ksh (modified) (1 diff)

trunk/libIGCM/libIGCM_sys/libIGCM_sys_brodie.ksh

@@ -164 +164 @@
         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"
+
 }