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

[noreply at svn.ci.uchicago.edu]

Author: tga
Date: 2011-02-15 15:48:43 -0600 (Tue, 15 Feb 2011)
New Revision: 4105

Modified:
   SwiftApps/SwiftR/Swift/exec/start-swift
Log:
Tweaks to cobalt qsub commadn - not quite working yet



Modified: SwiftApps/SwiftR/Swift/exec/start-swift
===================================================================
--- SwiftApps/SwiftR/Swift/exec/start-swift	2011-02-15 21:47:58 UTC (rev 4104)
+++ SwiftApps/SwiftR/Swift/exec/start-swift	2011-02-15 21:48:43 UTC (rev 4105)
@@ -293,12 +293,14 @@
     # for now, rely on swift worker to fork off worker processes 
     # so we have multiple workers per node.  In future could
     # add support for virtual node mode, etc
+    #CONTACT="http://10.40.9.151:$(echo $CONTACT | sed -e 's,^.*:,,')"
+    logdir=`pwd`
     qsub -t "$time" -n $nodes $queueDirective $kernDirective \
-	$projDirective -e `pwd`/SwiftR-workers.err \
-        -o `pwd`/SwiftR-workers.out --debuglog `pwd`/cobalt.log \
+	$projDirective -e $logdir/SwiftR-workers.err \
+        -o $logdir/SwiftR-workers.out --debuglog $logdir/cobalt.log \
         --cwd / \
 	--env WORKER_LOGGING_LEVEL=$workerLogging \
-	 /usr/bin/perl $SWIFTBIN/worker.pl $CONTACT \
+	 /usr/bin/perl $SWIFTBIN/worker.pl $CONTACT SwiftR-workers \
          $HOME/.globus/coasters $IDLETIMEOUT >$jobidfile     
     #TODO: change current working directory
     succ=$?
@@ -607,7 +609,7 @@
       kill $starterpid &> /dev/null
     fi
     if [ "_$jobid" != _ ]; then
-      qdel "$jobid"
+      qdel "$jobid" &> /dev/null
     fi
     # eit cleanly
     stdcleanup_end