Changeset 478

Timestamp:

06/01/11 11:18:29 (13 years ago)

Author:

sdipsl

Message:

• ACo as we do not use TMPDIR on scalar mercure we have to clean the tmp
• Job running on the titane mono are not killed randomly anymore by root

Location:

trunk/libIGCM

Files:

• AA_rebuild_fromArchive (modified) (1 diff)
• AA_rebuild_fromWorkdir (modified) (1 diff)
• libIGCM_sys/libIGCM_sys_mercure.ksh (modified) (2 diffs)

trunk/libIGCM/AA_rebuild_fromArchive

@@ -96 +96 @@
 #-Q- titane #MSUB -T 86400           # Limite de temps elapsed du job
 #-Q- titane #MSUB -p gen2211
-#-Q- titane #####MSUB -q mono        # mono killed prematurly rebuild job
-#-Q- titane #MSUB -n 8               # workaround to reserve full node
+#-Q- titane #MSUB -q mono
 #-Q- lxiv8 ######################
 #-Q- lxiv8 ## OBELIX      LSCE ##

trunk/libIGCM/AA_rebuild_fromWorkdir

@@ -96 +96 @@
 #-Q- titane #MSUB -T 86400          # Limite de temps elapsed du job
 #-Q- titane #MSUB -p gen2211
-#-Q- titane #####MSUB -q mono        # mono killed prematurly rebuild job
-#-Q- titane #MSUB -n 8               # workaround to reserve full node
+#-Q- titane #MSUB -q mono
 #-Q- lxiv8 ######################
 #-Q- lxiv8 ## OBELIX      LSCE ##

trunk/libIGCM/libIGCM_sys/libIGCM_sys_mercure.ksh

@@ -124 +124 @@
 #====================================================
 #- RUN_DIR_PATH : Temporary working directory (=> TMP)
-typeset -r RUN_DIR_PATH=${RUN_DIR_PATH:=${CSCRATCHDIR}/TMPDIR_IGCM/tmp$$}
+typeset -r RUN_DIR_PATH=${RUN_DIR_PATH:=${CSCRATCHDIR}/TMPDIR_IGCM/${JOBID}}
 
 #====================================================
@@ -676 +676 @@
     if ( $DEBUG_sys ) ; then
         echo "IGCM_sys_RmRunDir :" $@
-        echo "Dummy call, let the scheduler do that." 
+    fi
+
+    typeset RET
+
+    echo rm $@ > out_rsync 2>&1
+    \rm $@ >> out_rsync 2>&1
+    RET=$?
+
+    if [ ${RET} -gt 0 ] ; then
+        echo "IGCM_sys_RmRunDir : error."
+        cat out_rsync
+        IGCM_debug_Exit "IGCM_sys_RmRunDir"
+    else
+        \rm out_rsync
     fi
     IGCM_debug_PopStack "IGCM_sys_RmRunDir"