Changeset 710 for trunk

Timestamp:

09/27/12 16:23:09 (12 years ago)

Author:

sdipsl

Message:

• check existence of already copied files by IGCM_sys_PutBuffer_Out. #67

File:

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

trunk/libIGCM/libIGCM_sys/libIGCM_sys_mercure.ksh

@@ -990 +990 @@
   fi
 
-  typeset NB_ESSAI DELAI RET i exist skip
+  typeset NB_ESSAI DELAI status i exist skip
 
   # number of tentative
@@ -1053 +1053 @@
         # USUAL WAY
         \cp $1 $2 > out_rsync 2>&1
-        RET=$?
-        if [ ${RET} -gt 0 ]; then
+        status=$?
+        if [ ${status} -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."
@@ -1073 +1073 @@
 #       ${RSYNC} ${RSYNC_opt} ${RUN_DIR}/$1 ${2} >> out_rsync 2>&1
 
-#       RET=$?
-#       IGCM_sys_Rsync_out $RET
+#       status=$?
+#       IGCM_sys_Rsync_out $status
 
 #       ${libIGCM}/libIGCM_sys/IGCM_analyse_rsync_out.awk out_rsync
-#       (( RET=RET+$? ))
-
-    if [ ${RET} -gt 0 ] ; then
+#       (( status=status+$? ))
+
+    if [ ${status} -gt 0 ] ; then
       echo "IGCM_sys_Put_Out : error."
       cat out_rsync
@@ -1103 +1103 @@
     echo "IGCM_sys_PutBuffer_Out :" $@
   fi
+
+  typeset NB_ESSAI DELAI status i exist skip 
+
+  # number of tentative
+  NB_ESSAI=3
+  # time delay between tentative
+  DELAI=2
+
   if [ $DRYRUN = 0 ]; then
     if [ ! -f ${1} ] ; then
@@ -1112 +1120 @@
     IGCM_sys_Mkdir $( dirname $2 )
     #
-    typeset RET
 
     if [ X${JobType} = XRUN ] ; then
@@ -1119 +1126 @@
       fi
     fi
+
+    exist=false
+    skip=false
+    if [ -f $2 ] ; then
+      IGCM_debug_Print 1 "$2 already exist"
+      exist=true
+      if [ "X$( diff $1 $2 )" = X ] ; then
+        IGCM_debug_Print 2 "$1 and $2 are the same file, we skip the copy"
+        skip=true
+      else
+        IGCM_debug_Print 2 "$1 and $2 are not the same file, we force the copy"
+        skip=false
+      fi
+    fi
     #
-    # USUAL WAY
-    #\cp $1 $2 > out_rsync 2>&1
-    \mv $1 $2 > out_rsync 2>&1
-
-    RET=$?
-
-    if [ ${RET} -gt 0 ] ; then
+    if ( [ X${exist} = Xtrue ] && [ X${skip} = Xfalse ] ) ; then
+      IGCM_sys_Chmod u+w $2
+    fi
+
+    if [ X${skip} = Xfalse ] ; then
+      i=0
+      while [ $i -lt $NB_ESSAI ] ; do
+        # USUAL WAY
+        #\cp $1 $2 > out_rsync 2>&1
+        \mv $1 $2 > out_rsync 2>&1
+        status=$?
+        if [ ${status} -gt 0 ]; then
+          IGCM_debug_Print 2 "IGCM_sys_PutBuffer_Out : cp failed ${i}/${NB_ESSAI}"
+          IGCM_debug_Print 2 "IGCM_sys_PutBuffer_Out : sleep ${DELAI} seconds and try again."
+          sleep $DELAI
+        else
+          break
+        fi
+        (( i = i + 1 ))
+      done
+    fi
+
+    if [ ${status} -gt 0 ] ; then
       echo "IGCM_sys_PutBuffer_Out : error."
       cat out_rsync