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

[tga at ci.uchicago.edu]

Author: tga
Date: 2011-05-09 14:01:06 -0500 (Mon, 09 May 2011)
New Revision: 4460

Modified:
   SwiftApps/SwiftR/Swift/R/Workers.R
   SwiftApps/SwiftR/Swift/exec/start-swift
Log:
tweaks for error cases.


Modified: SwiftApps/SwiftR/Swift/R/Workers.R
===================================================================
--- SwiftApps/SwiftR/Swift/R/Workers.R	2011-05-09 18:48:40 UTC (rev 4459)
+++ SwiftApps/SwiftR/Swift/R/Workers.R	2011-05-09 19:01:06 UTC (rev 4460)
@@ -203,7 +203,7 @@
     }
 
     # launch server. 
-    out <- system(cmdString, intern=TRUE)
+    out <- suppressWarnings(system(cmdString, intern=TRUE))
     if (length(out) != 3 && length(out) != 2) {
         stop(paste("Unexpected output from start-swift: '", 
             paste(out, collapse="\n"), "'", "Launching may have failed"))
@@ -226,7 +226,7 @@
     }
     stat <- out[[3]]
     if (stat == "ok") {
-        cat("Started worker manager with pid ", pid, "\n")
+        cat("Started worker manager with pid", pid, "\n")
         # store worker info
         .swift.workers[[length(.swift.workers) + 1]] <<- output
         # add hook to ensure child process will be killed when 

Modified: SwiftApps/SwiftR/Swift/exec/start-swift
===================================================================
--- SwiftApps/SwiftR/Swift/exec/start-swift	2011-05-09 18:48:40 UTC (rev 4459)
+++ SwiftApps/SwiftR/Swift/exec/start-swift	2011-05-09 19:01:06 UTC (rev 4460)
@@ -129,6 +129,9 @@
   if [ _$GLOBUS_HOSTNAME = _ ]; then
     echo GLOBUS_HOSTNAME must be set to worker-reachable address of submit host for pbsf server mode.
     usage
+    if [ "$doack" = TRUE ]; then
+      echo ok > ackfifo
+    fi
     stdcleanup_start
     stdcleanup_end
     exit 1
@@ -387,7 +390,7 @@
   else
     echo Batch queue submission failed, exiting.
     if [ "$doack" = TRUE ]; then
-      echo 'Error: no ssh workers launched' > ackfifo
+      echo "Error: batch submission failed: qsub returned $succ" > ackfifo
     fi
     stdcleanup_start
     stdcleanup_end