[Swift-commit] r3659 - in SwiftApps/SwiftR: . Swift/R Swift/exec

[noreply at svn.ci.uchicago.edu]

Author: wilde
Date: 2010-10-05 18:06:00 -0500 (Tue, 05 Oct 2010)
New Revision: 3659

Modified:
   SwiftApps/SwiftR/Swift/R/Swift.R
   SwiftApps/SwiftR/Swift/exec/start-swift
   SwiftApps/SwiftR/TODO
   SwiftApps/SwiftR/UserGuide
Log:
Small fix to start-swift for multiple concurrent swift servers; correct swift.server option handling and some costmetic improvements in Swift.R

Modified: SwiftApps/SwiftR/Swift/R/Swift.R
===================================================================
--- SwiftApps/SwiftR/Swift/R/Swift.R	2010-10-05 21:44:04 UTC (rev 3658)
+++ SwiftApps/SwiftR/Swift/R/Swift.R	2010-10-05 23:06:00 UTC (rev 3659)
@@ -1,9 +1,16 @@
-swiftapply <- function( func, arglists, swiftserver=NULL, callsperbatch=NULL, runmode=NULL, initialize=NULL, workerhosts=NULL, keepwork=NULL, tmpdir=NULL )
+swiftapply <- function( func, arglists,
+                        swiftserver=NULL,
+                        callsperbatch=NULL,
+                        runmode=NULL,
+                        initialize=NULL,
+                        workerhosts=NULL,
+                        keepwork=NULL,
+                        tmpdir=NULL )
 {
-  # Set Swift default options if not passed as keyword paramets or pre-set by user
+  # Set Swift default options if not passed as keywords or pre-set by user
 
   if(is.null(swiftserver))
-    site <- getOption("swift.server")
+    swiftserver <- getOption("swift.server")
   if(is.null(swiftserver))
     swiftserver<-"local"
 
@@ -17,7 +24,7 @@
   if(is.null(runmode))
     runmode <- "service"
     # service: send requests to Swift service loop via fifo
-    # script:  run swift for each request, via RunSwiftScript.sh
+    # script:  run swift for each request, via RunSwiftScript.sh (currently broken)
     # manual:  for testing, let user run remote R server manually
 
   if(is.null(initialize))
@@ -46,9 +53,9 @@
   cat("  swiftserver =", swiftserver,"\n");
   cat("  callsperbatch =", callsperbatch,"\n")
   cat("  runmode =", runmode,"\n")
-  cat("  initialize =", initialize,"\n")
+  cat("  tmpdir =", tmpdir,"\n")
   cat("  workerhosts =", workerhosts,"\n")
-  cat("\nCurrent dir: ",getwd(),"\n");
+  cat("  initialize =", initialize,"\n\n")
 
   user <- Sys.info()[["user"]]
 

Modified: SwiftApps/SwiftR/Swift/exec/start-swift
===================================================================
--- SwiftApps/SwiftR/Swift/exec/start-swift	2010-10-05 21:44:04 UTC (rev 3658)
+++ SwiftApps/SwiftR/Swift/exec/start-swift	2010-10-05 23:06:00 UTC (rev 3659)
@@ -67,7 +67,7 @@
 
 echo DB $0: SWIFTRBIN=$SWIFTRBIN SWIFTBIN=$SWIFTBIN
 
-rundir=$tmp/$USER/SwiftR/swift.local  # rundir prefix # FIXME: handle multiple concurent independent swift servers per user
+rundir=$tmp/$USER/SwiftR/swift.$site  # rundir prefix # FIXME: handle multiple concurent independent swift servers per user
 mkdir -p $(dirname $rundir)
 trundir=$(mktemp -d $rundir.XXXX) # FIXME: check success
 rm -rf $rundir

Modified: SwiftApps/SwiftR/TODO
===================================================================
--- SwiftApps/SwiftR/TODO	2010-10-05 21:44:04 UTC (rev 3658)
+++ SwiftApps/SwiftR/TODO	2010-10-05 23:06:00 UTC (rev 3659)
@@ -24,6 +24,7 @@
 
 test logic for creating trundir in start-swift-Rserver
 
+test for suitable java in start-swift command.
 
 test using persistent server and ssh to communcado; then mcs.
 
@@ -31,9 +32,11 @@
 
   start-swift-workers: if hostis localhost, launch workers directly, not with ssh
 
-  debug why workers/coasters hang after several minutes of idle time
+fixed: ??  debug why workers/coasters hang after several minutes of idle time
 
+- fix R hanging on fifo read. be able to interrupt it and re-sync. maybe change to read and file not fifo?
 
+
 -----
 
   find why TestSwift is faster with local internal coaster service (13 secs) than with external service (19 seconds)

Modified: SwiftApps/SwiftR/UserGuide
===================================================================
--- SwiftApps/SwiftR/UserGuide	2010-10-05 21:44:04 UTC (rev 3658)
+++ SwiftApps/SwiftR/UserGuide	2010-10-05 23:06:00 UTC (rev 3659)
@@ -20,8 +20,17 @@
 
 CAVEATS
 
-Only one Swift server running per user; can only be used by one R client workspace at a time.
+# fixed: Only one Swift server running per user; can only be used by one R client workspace at a time.
 
+when fifos get hung, need to use kill or Quit to break out of R; will fix.
+
+no retry if swift dies in server loop.
+
+Swift returns Error object when remote side fails.
+
+only lapply is implemented (also SwiftApply) - need to see if we can cut down arg passing overhead for many of the apply() cases
+
+
 INSTALL
 
 cd ???