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

[ketan at ci.uchicago.edu]

Author: ketan
Date: 2011-09-28 15:26:35 -0500 (Wed, 28 Sep 2011)
New Revision: 5190

Modified:
   trunk/bin/grid/start-grid-service
   trunk/bin/grid/start-grid-services
   trunk/bin/grid/start-swift-service
Log:
small changes

Modified: trunk/bin/grid/start-grid-service
===================================================================
--- trunk/bin/grid/start-grid-service	2011-09-28 20:25:15 UTC (rev 5189)
+++ trunk/bin/grid/start-grid-service	2011-09-28 20:26:35 UTC (rev 5190)
@@ -44,9 +44,12 @@
 
 echo THROTTLE=$THROTTLE LOGLEVEL=$LOGLEVEL
 
+numsites=`cat greensites | wc -l`
+
 #coaster-service -port 1984 -localport 35753 -nosec >& local-coaster-service.out &
 sleep 5
 start-swift-service 1 &
+#start-swift-service $numsites &
 sleep 5
 SPORT=$(cat service.sports)
 cat >sites.grid-ps.xml <<EOF

Modified: trunk/bin/grid/start-grid-services
===================================================================
--- trunk/bin/grid/start-grid-services	2011-09-28 20:25:15 UTC (rev 5189)
+++ trunk/bin/grid/start-grid-services	2011-09-28 20:26:35 UTC (rev 5190)
@@ -54,19 +54,6 @@
 
 sleep 60
 
-#SPORT=$(cat service.sports)
-#just temporary
-#SPORT=100
-rm -f service.sports
-rm -f service.wports
-m=`expr $n - 1`
-for i in `seq -w 00 $m`
-do
-    cat service-$i.sport >> service.sports
-    echo "" >> service.sports
-    cat service-$i.wport >> service.wports
-    echo "" >> service.wports
-done
 #sed '$d' < greensites > file1 ; mv file1 greensites
 sed '$d' < service.sports > file2 ; mv file2 service.sports
 sed '$d' < service.wports > file3 ; mv file3 service.wports

Modified: trunk/bin/grid/start-swift-service
===================================================================
--- trunk/bin/grid/start-swift-service	2011-09-28 20:25:15 UTC (rev 5189)
+++ trunk/bin/grid/start-swift-service	2011-09-28 20:26:35 UTC (rev 5190)
@@ -16,8 +16,8 @@
 trap ontrap 1 2 3 15  # FIXME: Not needed?
 
 # Launch the requested number of services
+ rm -f service.sports service.wports
 
-rm -f service.sports service.wports
 for i in `seq -w 0 $((NSERVICES - 1))`; do
   rm -f service-$i.{sport,wport,pid,out}
   $SERVICE -nosec -passive -portfile service-$i.sport -localportfile service-$i.wport &> service-$i.out  &
@@ -32,7 +32,7 @@
 for (( tries=0; tries < $maxtries; tries++ )); do
   sleep 1
   errors=0
-  rm service.sports service.wports
+  rm -f service.sports service.wports
   for i in `seq -w 0 $((NSERVICES - 1))`; do
     if [ -s service-$i.sport -a -s service-$i.wport ]; then
       echo $(cat service-$i.sport) >> service.sports
@@ -49,7 +49,7 @@
 done
 
 if [ $errors != 0 ]; then
-  echo $0: $errors services failesd to report their port numbers
+  echo $0: $errors services failed to report their port numbers
 fi
 echo $0: $((NSERVICES-errors)) services started successfully