[Swift-commit] r5068 - trunk/bin/grid

[ketan at ci.uchicago.edu]

Author: ketan
Date: 2011-09-02 16:37:19 -0500 (Fri, 02 Sep 2011)
New Revision: 5068

Modified:
   trunk/bin/grid/run-worker.sh
   trunk/bin/grid/start-grid-service
Log:
start-grid-service now starts a local service and places the localhost pool along with the grid pool in the sites.xml

Modified: trunk/bin/grid/run-worker.sh
===================================================================
--- trunk/bin/grid/run-worker.sh	2011-09-02 20:38:42 UTC (rev 5067)
+++ trunk/bin/grid/run-worker.sh	2011-09-02 21:37:19 UTC (rev 5068)
@@ -3,7 +3,6 @@
 contact=$1
 workername=$2
 origlogdir=$3
-export PATH=${OSG_APP}/scec:$PATH
 echo OSG_WN_TMP=$OSG_WN_TMP
 if [ _$OSG_WN_TMP = _ ]; then
   OSG_WN_TMP=/tmp
@@ -12,7 +11,7 @@
 logdir=$(mktemp -d $OSG_WN_TMP/${workername}.workerdir.XXXXXX)
 nlines=1000
 
-PATH=$OSG_APP/extenci/aashish/terfix/bin:$PATH
+PATH=$OSG_APP:$OSG_APP/scec:$OSG_APP/extenci/aashish/terfix/bin:$PATH
 
 echo "=== contact: $contact"
 echo "=== name:    $workername Running in dir $(pwd)"

Modified: trunk/bin/grid/start-grid-service
===================================================================
--- trunk/bin/grid/start-grid-service	2011-09-02 20:38:42 UTC (rev 5067)
+++ trunk/bin/grid/start-grid-service	2011-09-02 21:37:19 UTC (rev 5068)
@@ -44,12 +44,14 @@
 
 echo THROTTLE=$THROTTLE LOGLEVEL=$LOGLEVEL
 
+coaster-service -port 1984 -localport 35753 -nosec >& local-coaster-service.out &
+sleep 5
 start-swift-service 1 &
 sleep 5
 SPORT=$(cat service.sports)
 cat >sites.grid-ps.xml <<EOF
   <config>
-    <pool handle="localhost">
+    <pool handle="grid">
       <execution provider="coaster-persistent" url="http://localhost:$SPORT" jobmanager="local:local"/>
       <profile namespace="globus" key="workerManager">passive</profile>
       <profile namespace="globus" key="jobsPerNode">$JOBSPERNODE</profile>
@@ -59,6 +61,17 @@
       <profile namespace="swift" key="stagingMethod">proxy</profile>
       <workdirectory>/tmp/$USER</workdirectory>
     </pool>
+    
+   <pool handle="localhost">
+      <execution provider="coaster-persistent" url="http://localhost:1984" jobmanager="local:local"/>
+      <profile namespace="globus" key="workerManager">passive</profile>
+      <profile namespace="globus" key="jobsPerNode">$JOBSPERNODE</profile>
+      <profile key="jobThrottle" namespace="karajan">$THROTTLE</profile>
+      <profile namespace="karajan" key="initialScore">10000</profile>
+      <filesystem provider="local" url="none" />
+      <profile namespace="swift" key="stagingMethod">proxy</profile>
+      <workdirectory>/tmp/$USER</workdirectory>
+    </pool>
   </config>
 EOF