Changeset 793 for trunk/libIGCM/libIGCM_sys

Timestamp:

02/13/13 12:44:51 (11 years ago)

Author:

sdipsl

Message:

Continue adaptation to have the correct behaviour when SpaceName?=TEST

Reminder when SpaceName?=TEST everything will go in ada $WORKDIR not in gaya $HOMEGAYA

File:

• trunk/libIGCM/libIGCM_sys/libIGCM_sys_ada.ksh (modified) (2 diffs)

trunk/libIGCM/libIGCM_sys/libIGCM_sys_ada.ksh

@@ -344 +344 @@
   fi
   #- creation de repertoire sur le serveur fichier
-  rsh ${STOREHOST} -n mkdir -p $1
+  IGCM_sys_IsFileArchived $1
+  if [ $? = 0 ] ; then
+    rsh ${STOREHOST} -n mkdir -p $1
+  else
+    mkdir -p $1
+  fi  
 
   if [ $? -gt 0 ] ; then
@@ -969 +974 @@
     #IGCM_sys_TestDirArchive $( dirname $2 )
     #
-    # USUAL WAY
-    # add dmget (to demigrate all offline files) to reduce time of this command :
-    IGCM_sys_RshArchive "dmfind $1 -state MIG -o -state OFL -o -state PAR | dmget -q -n"
-
-    i=0
-    while [ $i -lt $NB_ESSAI ] ; do
-      \rcp -rp ${STOREHOST}:$1 $2 > out_rsync 2>&1
+    # Command depends on targeted filesystem
+    IGCM_sys_IsFileArchived $1
+    if [ $? = 0 ] ; then
+      # add dmget (to demigrate all offline files) to reduce time of this command :
+      IGCM_sys_RshArchive "dmfind $1 -state MIG -o -state OFL -o -state PAR | dmget -q -n"
+      i=0
+      while [ $i -lt $NB_ESSAI ] ; do
+        \rcp -rp ${STOREHOST}:$1 $2 > out_rsync 2>&1
+        status=$?
+        if [ ${status} -gt 0 ]; then
+          IGCM_debug_Print 2 "IGCM_sys_Get_Dir : rcp failed error code ${status} ${i}/${NB_ESSAI}"
+          IGCM_debug_Print 2 "IGCM_sys_Get_Dir : sleep ${DELAI} seconds and try again."
+          sleep $DELAI
+        else
+          break
+        fi
+        (( i = i + 1 ))
+      done
+    else
+      \cp -rp $1 $2 > out_rsync 2>&1
       status=$?
-      if [ ${status} -gt 0 ]; then
-        IGCM_debug_Print 2 "IGCM_sys_Get_Dir : rcp failed error code ${status} ${i}/${NB_ESSAI}"
-        IGCM_debug_Print 2 "IGCM_sys_Get_Dir : sleep ${DELAI} seconds and try again."
-        sleep $DELAI
+      if [ ${status} -gt 0 ] ; then
+        IGCM_debug_Print 2 "IGCM_sys_Get_Dir : cp failed error code ${status}"
+        cat out_rsync
+        IGCM_debug_Exit "IGCM_sys_Get_Dir"
       else
-        break
+        \rm out_rsync
       fi
-      (( i = i + 1 ))
-    done
-
+    fi
     if [ ${status} -gt 0 ] ; then
       echo "IGCM_sys_Get_Dir : error."