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

[tga at ci.uchicago.edu]

Author: tga
Date: 2011-09-27 16:17:45 -0500 (Tue, 27 Sep 2011)
New Revision: 5184

Modified:
   SwiftApps/SwiftR/Swift/exec/start-swift
Log:
Remove incorrect local worker termination logic

Modified: SwiftApps/SwiftR/Swift/exec/start-swift
===================================================================
--- SwiftApps/SwiftR/Swift/exec/start-swift	2011-09-27 21:06:34 UTC (rev 5183)
+++ SwiftApps/SwiftR/Swift/exec/start-swift	2011-09-27 21:17:45 UTC (rev 5184)
@@ -724,18 +724,7 @@
   source $SWIFTRBIN/configure-server-local
   function onexit {
     stdcleanup_start
-    # Find and terminate R workers: they should register their PiD
-    # in a standard location based on the pid of this start-swift
-    # script
-    for rwork in `(shopt -s nullglob; echo ../Rworkers/worker.$$/*/)`
-    do
-        if [ -f "$rwork/R.pid" ]; then
-            kill `cat $rwork/R.pid` &> /dev/null
-        fi
-        if [ "$keepdir" = "FALSE" ]; then
-            rm -rf $rwork
-        fi
-    done
+    # For time being, allow R workers to just time out
     stdcleanup_end
     exit 0
   }