Changeset 676 for trunk/libIGCM/libIGCM_sys/libIGCM_sys_titane.ksh

Timestamp:

06/05/12 16:31:28 (12 years ago)

Author:

sdipsl

Message:

• Prevent the fact that cp command is not reliable on ccrt/tgcc filesystems
• Cosmetics

File:

• trunk/libIGCM/libIGCM_sys/libIGCM_sys_titane.ksh (modified) (6 diffs)

trunk/libIGCM/libIGCM_sys/libIGCM_sys_titane.ksh

@@ -1211 +1211 @@
     echo "IGCM_sys_Put_Out :" $@
   fi
+
+  typeset NB_ESSAI DELAI RET i
+
+  # number of tentative
+  NB_ESSAI=3
+  # time delay between tentative
+  DELAI=2
+
   if [ $DRYRUN = 0 ]; then
     if [ ! -f ${1} ] ; then
@@ -1220 +1228 @@
     IGCM_sys_MkdirArchive $( dirname $2 )
     #
-    typeset RET
 
     #=====================================================
@@ -1242 +1249 @@
     fi
     #
+
+    (( i = 0 ))
+    while [ $i -lt $NB_ESSAI ] ; do
     # USUAL WAY
-    \cp $1 $2 > out_rsync 2>&1
-    RET=$?
+      \cp $1 $2 > out_rsync 2>&1
+      RET=$?
+      if [ ${RET} -gt 0 ]; then
+        IGCM_debug_Print 2 "IGCM_sys_Put_Out : cp failed ${i}/${NB_ESSAI}"
+        IGCM_debug_Print 2 "IGCM_sys_Put_Out : sleep ${DELAI} seconds and try again."
+        sleep $DELAI
+      else
+        break
+      fi
+      (( i = i + 1 ))
+    done
 
 #       #RSYNC WITH NETWORK SSH CALL
@@ -1328 +1347 @@
 
   typeset DEST RET dm_liste ifile target file_work
+  typeset NB_ESSAI DELAI status i
 
   if ( $DEBUG_sys ) ; then
     echo "IGCM_sys_Get :" $@
   fi
+
+  # number of tentative
+  NB_ESSAI=3
+  # time delay between tentative
+  DELAI=2
+
   if [ $DRYRUN -le 2 ]; then
     if [ X${1} = X'/l' ] ; then
@@ -1357 +1383 @@
     #fi
 
-    # test if the (first) file is present in the old computation :
-    IGCM_sys_TestFileArchive ${dm_liste[0]}
-    RET=$?
-    if [ ${RET} -gt 0 ] ; then
-      echo "IGCM_sys_Get, ERROR : regular file ${dm_liste[0]} DOES NOT EXIST ."
-      IGCM_debug_Exit "IGCM_sys_Get"
-    fi
-
-    #dmget ${dm_liste[*]} > out_rsync 2>&1
     ccc_hsm get ${dm_liste[*]} > out_rsync 2>&1
     RET=$?
@@ -1400 +1417 @@
       for target in ${dm_liste[*]} ; do
         local_file=$( basename ${target} )
-        \cp ${target} ${DEST}/${local_file} >> out_rsync 2>&1
-        (( RET = RET + $? ))
+        (( i = 0 ))
+        # test if the target file is present before the loop
+        IGCM_sys_TestFileArchive ${target}
+        RET=$?
+        if [ ${RET} -gt 0 ] ; then
+          echo "IGCM_sys_Get, ERROR : regular file ${dm_liste[0]} DOES NOT EXIST ."
+          IGCM_debug_Exit "IGCM_sys_Get"
+        else
+          while [ $i -lt $NB_ESSAI ] ; do
+            \cp ${target} ${DEST}/${local_file} >> out_rsync 2>&1
+            status=$?
+            if [ ${status} -gt 0 ]; then
+              IGCM_debug_Print 2 "IGCM_sys_Get : cp failed ${i}/${NB_ESSAI}"
+              IGCM_debug_Print 2 "IGCM_sys_Get : sleep ${DELAI} seconds and try again."
+              sleep $DELAI
+            else
+              break
+            fi
+            (( i = i + 1 ))
+          done
+          (( RET = RET + status ))
+        fi
       done
     else