[Swift-commit] r5174 - SwiftApps/SwiftR/Swift/exec

[tga at ci.uchicago.edu]

Author: tga
Date: 2011-09-26 14:35:12 -0500 (Mon, 26 Sep 2011)
New Revision: 5174

Modified:
   SwiftApps/SwiftR/Swift/exec/EvalRBatchPersistent.sh
Log:
Removed unnecessary file creation


Modified: SwiftApps/SwiftR/Swift/exec/EvalRBatchPersistent.sh
===================================================================
--- SwiftApps/SwiftR/Swift/exec/EvalRBatchPersistent.sh	2011-09-26 16:24:26 UTC (rev 5173)
+++ SwiftApps/SwiftR/Swift/exec/EvalRBatchPersistent.sh	2011-09-26 19:35:12 UTC (rev 5174)
@@ -111,20 +111,16 @@
   (
     sleep ${timeout}s
     
-    touch $SLOTDIR/timeout_reached
     # if mutex has been acquired, know another process active
     if mkdir $SLOTDIR/mutex ; then
-        touch $SLOTDIR/timeout_reached_mutex
         new_idletimer_id=$(cat $SLOTDIR/idletimer)
         echo new: "$new_idletimer_id" old "$idletimer_id" > $SLOTDIR/idletimer_ids
         if [ "$new_idletimer_id" = "$idletimer_id" ]; then
-          touch $SLOTDIR/timeout_reached_mutex_killed
           echo killing idle R process $rpid
           kill $rpid
           rm -f $SLOTDIR/idletimer $SLOTDIR/fromR.fifo $SLOTDIR/toR.fifo
           touch $SLOTDIR/timedout
         else
-            touch $SLOTDIR/timeout_reached_mutex_notkilled
         fi
         rmdir $SLOTDIR/mutex
     fi
@@ -258,8 +254,6 @@
 
 if wait $echopid
 then
-    touch $SLOTDIR/lastwrite
-
     echo DB: Sent request
     stop_timeout # started up ok
     echo dummy stderr response 1>&2 # FIXME - testing if this is the provider staging problem (not xfering zero len stderr)