Changeset 1234 for trunk/libIGCM

Timestamp:

09/03/15 17:12:53 (9 years ago)

Author:

sdipsl

Message:

• catch the status of the stat command. It led to silent failure when the filesystem suffers some glitch. See #264

Location:

trunk/libIGCM

Files:

• libIGCM_debug/libIGCM_debug.ksh (modified) (2 diffs)
• libIGCM_sys/libIGCM_sys.ksh (modified) (2 diffs)
• libIGCM_sys/libIGCM_sys_curie.ksh (modified) (2 diffs)

trunk/libIGCM/libIGCM_debug/libIGCM_debug.ksh

@@ -128 +128 @@
   typeset buffer send_messages mail_frequency
   typeset last_mail_date__file
+  typeset secondsBetweenRefAndLastMail secondsSinceLastMail
 
   b64_encoded_msg=$1
@@ -148 +149 @@
   else
     # compute last time the file was changed (in seconds)
-    seconds_since_last_mail=$(( $(date +%s) - $(stat -c %Y ${last_mail_date__file}) ))
+    secondsBetweenRefAndLastMail=$(stat -c %Y ${last_mail_date__file})
+    status=$?
+    #
+    if [ ${status} -gt 0 ] ; then
+      IGCM_debug_Exit "IGCM_debug_send_AMQP_msg__MAILTUNNEL"
+    fi
+    secondsSinceLastMail=$(( $(date +%s) - ${secondsBetweenRefAndLastMail} ))
     # send message when exceeding threshold
-    [ ${seconds_since_last_mail} -gt ${mail_frequency} ] && send_messages=1
+    [ ${secondsSinceLastMail} -gt ${mail_frequency} ] && send_messages=1
   fi
 

trunk/libIGCM/libIGCM_sys/libIGCM_sys.ksh

@@ -700 +700 @@
 
   typeset NB_ESSAI DELAI status i exist skip
+  typeset fileDeviceNumberInHex directoryDeviceNumberInHex
 
   # number of tentative
@@ -738 +739 @@
       i=0
       while [ $i -lt $NB_ESSAI ] ; do
-        if [ $( stat -c %d $1 ) -ne $( stat -c %d $( dirname $2 ) ) ] ; then
-          # USUAL WAY
+        # Identify file system
+        fileDeviceNumberInHex=$( stat -c %d $1 )
+        status=$?
+        if [ ${status} -gt 0 ] ; then
+          IGCM_debug_Exit "IGCM_sys_PutBuffer_Out"
+        fi
+        # Identify file system
+        directoryDeviceNumberInHex=$( stat -c %d $( dirname $2 ) )
+        status=$?
+        if [ ${status} -gt 0 ] ; then
+          IGCM_debug_Exit "IGCM_sys_PutBuffer_Out"
+        fi
+
+        if [ ${fileDeviceNumberInHex} -ne ${directoryDeviceNumberInHex} ] ; then
+          # They are not on the same device. USUAL WAY
           \cp $1 $2 > ${OUTCOMMAND_PATH}/out_command_${LOGIN}.$$ 2>&1
           status=$?
         else
-          # NOT SO USUAL WAY
+          # They are on the same device. USUAL WAY
           \mv $1 $2 > ${OUTCOMMAND_PATH}/out_command_${LOGIN}.$$ 2>&1
           status=$?

trunk/libIGCM/libIGCM_sys/libIGCM_sys_curie.ksh

@@ -636 +636 @@
 
   typeset NB_ESSAI DELAI status i exist skip
+  typeset fileDeviceNumberInHex directoryDeviceNumberInHex
 
   # number of tentative
@@ -673 +674 @@
       i=0
       while [ $i -lt $NB_ESSAI ] ; do
-        if [ $( stat -c %d $1 ) -ne $( stat -c %d $( dirname $2 ) ) ] ; then
-          # USUAL WAY
+        # Identify file system
+        fileDeviceNumberInHex=$( stat -c %d $1 )
+        status=$?
+        if [ ${status} -gt 0 ] ; then
+          IGCM_debug_Exit "IGCM_sys_Put_Out"
+        fi
+        # Identify file system
+        directoryDeviceNumberInHex=$( stat -c %d $( dirname $2 ) )
+        status=$?
+        if [ ${status} -gt 0 ] ; then
+          IGCM_debug_Exit "IGCM_sys_Put_Out"
+        fi
+
+        if [ ${fileDeviceNumberInHex} -ne ${directoryDeviceNumberInHex} ] ; then
+          # They are not on the same device. USUAL WAY
           \cp $1 $2 > ${OUTCOMMAND_PATH}/out_command_${LOGIN}.$$ 2>&1
           status=$?
         else
-          # NOT SO USUAL WAY
+          # They are on the same device. NOT SO USUAL WAY
           \mv $1 $2 > ${OUTCOMMAND_PATH}/out_command_${LOGIN}.$$ 2>&1
           status=$?