Changeset 668 for trunk

Timestamp:

05/14/12 12:47:16 (12 years ago)

Author:

sdipsl

Message:

• Adjustement to bypass some curie filesystem issue

File:

• trunk/libIGCM/libIGCM_sys/libIGCM_sys_curie.ksh (modified) (4 diffs)

trunk/libIGCM/libIGCM_sys/libIGCM_sys_curie.ksh

@@ -1184 +1184 @@
 
   # number of tentative
-  NB_ESSAI=10
+  NB_ESSAI=3
   # time delay between tentative
-  DELAI=10
+  DELAI=2
 
   if [ $DRYRUN = 0 ]; then
@@ -1323 +1323 @@
 
   # number of tentative
-  NB_ESSAI=10
+  NB_ESSAI=3
   # time delay between tentative
-  DELAI=10
+  DELAI=2
 
   if [ $DRYRUN -le 2 ]; then
@@ -1351 +1351 @@
     #    fi
     #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
 
     ccc_hsm get ${dm_liste[*]} > out_rsync 2>&1
@@ -1395 +1387 @@
         local_file=$( basename ${target} )
         (( i = 0 ))
-        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 ))
+        # 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