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

[tga at ci.uchicago.edu]

Author: tga
Date: 2011-09-22 13:52:42 -0500 (Thu, 22 Sep 2011)
New Revision: 5156

Modified:
   SwiftApps/SwiftR/Swift/exec/EvalRBatchPersistent.sh
Log:
Changed R worker directory name to avoid clashes when multiple worker machines share same temporary directory (as on beagle)



Modified: SwiftApps/SwiftR/Swift/exec/EvalRBatchPersistent.sh
===================================================================
--- SwiftApps/SwiftR/Swift/exec/EvalRBatchPersistent.sh	2011-09-22 16:03:18 UTC (rev 5155)
+++ SwiftApps/SwiftR/Swift/exec/EvalRBatchPersistent.sh	2011-09-22 18:52:42 UTC (rev 5156)
@@ -87,12 +87,12 @@
 
 # Ensure that the dir for this slot exists. 
 
-BASEDIR=$tmp/$(id -nu)/SwiftR/Rworkers
+BASEDIR=$tmp/$(id -nu)/SwiftR/Rworkers.$(hostname)
 if mkdir -p $BASEDIR; then
     :
 else
     OLD_BASEDIR=$BASEDIR
-    BASEDIR=$tmp/SwiftR.${SWIFT_WORKER_PID}.Rworkers
+    BASEDIR=$tmp/SwiftR.$(hostname).${SWIFT_WORKER_PID}.Rworkers
     mkdir -p $BASEDIR
     basedir_ok=$?
     if [ $basedir_ok != 0 ]; then