Changeset 520 for trunk/libIGCM/libIGCM_sys

Timestamp:

11/22/11 18:57:12 (13 years ago)

Author:

sdipsl

Message:

Dont exit during dmget error (can be ignore most of the time in fact). Stop later if the cp commands fails.
Homogenize commands between titane, cesium and mercure scalaire.

Location:

trunk/libIGCM/libIGCM_sys

Files:

• libIGCM_sys_cesium.ksh (modified) (1 diff)
• libIGCM_sys_mercure.ksh (modified) (2 diffs)
• libIGCM_sys_titane.ksh (modified) (3 diffs)

trunk/libIGCM/libIGCM_sys/libIGCM_sys_cesium.ksh

@@ -1112 +1112 @@
         dmget ${dm_liste[*]} > out_rsync 2>&1
         RET=$?
+
         if [ ${RET} -gt 0 ] ; then
             echo "WARNING IGCM_sys_Get : demigration error."
             cat out_rsync
-            IGCM_debug_Exit "IGCM_sys_Get"
-        fi
+            echo "WARNING IGCM_sys_Get : will stop later if the cp fails."
+        fi
+
+        #if [ ${RET} -gt 0 ] ; then
+        #    if [ ! "X$( grep "Lost dmusrcmd connection" out_rsync )" = "X" ] ; then
+        #       cat out_rsync
+        #       echo "WARNING IGCM_sys_Get : Lost dmusrcmd connection : "
+        #       sleep 30
+        #       echo "We try another time"
+        #       dmget ${dm_liste[*]} > out_rsync 2>&1
+        #       RET=$?
+        #       if [ ${RET} -gt 0 ] ; then
+        #           echo "ERROR IGCM_sys_Get : again demigration error :"
+        #           cat out_rsync
+        #           IGCM_debug_Exit "IGCM_sys_Get"
+        #       fi
+        #    else
+        #       echo "ERROR IGCM_sys_Get : demigration error :"
+        #       cat out_rsync
+        #       IGCM_debug_Exit "IGCM_sys_Get"
+        #    fi
+        #fi
 
         #USUAL WAY

trunk/libIGCM/libIGCM_sys/libIGCM_sys_mercure.ksh

@@ -919 +919 @@
         #
         typeset RET exist skip
-        #
+
+        #=====================================================
+        #         COMMENT OUT DOUBLE COPY ON SCRATCHDIR
+        #=====================================================
+
+        #echo ${2} | grep "${R_OUT}" > /dev/null 2>&1
+        #if [ $? -eq 0 ] ; then
+        #    typeset WORKPATH FILEPATH
+        #    WORKPATH=$( dirname $2 | sed -e "s|${R_OUT}|${R_OUT_SCR}|" )
+        #    IGCM_sys_MkdirWork ${WORKPATH} 
+        #    FILEPATH=${WORKPATH}/$( basename $2 )
+        #    #
+        #    IGCM_sys_Cp ${1} ${FILEPATH}
+        #fi
+
         if [ X${JobType} = XRUN ] ; then
             if [ X${3} = X ] ; then
@@ -1022 +1036 @@
             echo "IGCM_sys_Get, ERROR : regular file ${dm_liste[0]} DOES NOT EXIST ."
             IGCM_debug_Exit "IGCM_sys_Get"
-            #IGCM_debug_PopStack "IGCM_sys_Get"
-            #return
         fi
 
         dmget ${dm_liste[*]} > out_rsync 2>&1
         RET=$?
+
         if [ ${RET} -gt 0 ] ; then
             echo "WARNING IGCM_sys_Get : demigration error."
             cat out_rsync
-            #IGCM_debug_Exit "IGCM_sys_Get"
-            #IGCM_debug_PopStack "IGCM_sys_Get"
-            #return
-        fi
+            echo "WARNING IGCM_sys_Get : will later stop if the cp fails."
+        fi
+
+        #if [ ${RET} -gt 0 ] ; then
+        #    if [ ! "X$( grep "Lost dmusrcmd connection" out_rsync )" = "X" ] ; then
+        #       cat out_rsync
+        #       echo "WARNING IGCM_sys_Get : Lost dmusrcmd connection : "
+        #       sleep 30
+        #       echo "We try another time"
+        #       dmget ${dm_liste[*]} > out_rsync 2>&1
+        #       RET=$?
+        #       if [ ${RET} -gt 0 ] ; then
+        #           echo "ERROR IGCM_sys_Get : again demigration error :"
+        #           cat out_rsync
+        #           IGCM_debug_Exit "IGCM_sys_Get"
+        #       fi
+        #    else
+        #       echo "ERROR IGCM_sys_Get : demigration error :"
+        #       cat out_rsync
+        #       IGCM_debug_Exit "IGCM_sys_Get"
+        #    fi
+        #fi
 
         #USUAL WAY

trunk/libIGCM/libIGCM_sys/libIGCM_sys_titane.ksh

@@ -925 +925 @@
     fi
     if [ $DRYRUN = 0 ]; then
-        if [ ! -d ${1} ] ; then
-            echo "WARNING : IGCM_sys_Get_Dir ${1} DOES NOT EXIST ."
-            IGCM_debug_PopStack "IGCM_sys_Get_Dir"
-            return
-        fi
+#       if [ ! -d ${1} ] ; then
+#           echo "WARNING : IGCM_sys_Get_Dir ${1} DOES NOT EXIST ."
+#           IGCM_debug_PopStack "IGCM_sys_Get_Dir"
+#           return
+#       fi
 
         typeset RET
@@ -937 +937 @@
         #
         #USUAL WAY
+        # add dmget (to demigrate all offline files) to reduce time of this command :
+        dmget $1/*
         \cp -r $1 $2 > out_rsync 2>&1
         RET=$?
@@ -1160 +1162 @@
             echo "IGCM_sys_Get, ERROR : regular file ${dm_liste[0]} DOES NOT EXIST ."
             IGCM_debug_Exit "IGCM_sys_Get"
-            IGCM_debug_PopStack "IGCM_sys_Get"
-            return
-        fi
-
-#       dmget ${dm_liste[*]} > out_rsync 2>&1
-#       RET=$?
-#       if [ ${RET} -gt 0 ] ; then
-#           echo "IGCM_sys_Get : demigration error."
-#           cat out_rsync
-#           IGCM_debug_Exit "IGCM_sys_Get"
-#       fi
+        fi
+
+        dmget ${dm_liste[*]} > out_rsync 2>&1
+        RET=$?
+
+        if [ ${RET} -gt 0 ] ; then
+            echo "WARNING IGCM_sys_Get : demigration error."
+            cat out_rsync
+            echo "WARNING IGCM_sys_Get : will stop later if the cp fails."
+        fi
+
+        #if [ ${RET} -gt 0 ] ; then
+        #    if [ ! "X$( grep "Lost dmusrcmd connection" out_rsync )" = "X" ] ; then
+        #       cat out_rsync
+        #       echo "WARNING IGCM_sys_Get : Lost dmusrcmd connection : "
+        #       sleep 30
+        #       echo "We try another time"
+        #       dmget ${dm_liste[*]} > out_rsync 2>&1
+        #       RET=$?
+        #       if [ ${RET} -gt 0 ] ; then
+        #           echo "ERROR IGCM_sys_Get : again demigration error :"
+        #           cat out_rsync
+        #           IGCM_debug_Exit "IGCM_sys_Get"
+        #       fi
+        #    else
+        #       echo "ERROR IGCM_sys_Get : demigration error :"
+        #       cat out_rsync
+        #       IGCM_debug_Exit "IGCM_sys_Get"
+        #    fi
+        #fi
 
         #USUAL WAY