[Swift-commit] r5433 - branches/release-0.93/bin

[davidk at ci.uchicago.edu]

Author: davidk
Date: 2011-12-17 20:38:22 -0600 (Sat, 17 Dec 2011)
New Revision: 5433

Modified:
   branches/release-0.93/bin/gensites
   branches/release-0.93/bin/start-coaster-service
   branches/release-0.93/bin/stop-coaster-service
Log:
Various minor updates


Modified: branches/release-0.93/bin/gensites
===================================================================
--- branches/release-0.93/bin/gensites	2011-12-18 02:19:12 UTC (rev 5432)
+++ branches/release-0.93/bin/gensites	2011-12-18 02:38:22 UTC (rev 5433)
@@ -226,7 +226,7 @@
    # Test for HOST/GLOBUS_HOSTNAME - the only values which don't match
    if [ "$TOKEN" == "HOST" ]; then
       if [ -z "$GLOBUS_HOSTNAME" ]; then
-         crash "Not specified: GLOBUS_HOSTNAME"
+         GLOBUS_HOSTNAME=$( hostname -f )
       fi
    elif grep _${TOKEN}_ $TEMPLATE_PATH > /dev/null; then
       if [ -z "${!TOKEN}" ]; then

Modified: branches/release-0.93/bin/start-coaster-service
===================================================================
--- branches/release-0.93/bin/start-coaster-service	2011-12-18 02:19:12 UTC (rev 5432)
+++ branches/release-0.93/bin/start-coaster-service	2011-12-18 02:38:22 UTC (rev 5433)
@@ -64,6 +64,7 @@
    # Start worker script
    for MACHINE in $WORKER_HOSTS
    do
+      echo $MACHINE >> $HOME/.swift/machines
       if [ "$SSH_TUNNELING" == "yes" ]; then
          ssh -R *:$PORT:localhost:$PORT $WORKER_USERNAME@$MACHINE sleep 999 &
          echo $! >> $PID_FILE
@@ -108,13 +109,13 @@
    WORKER_HOSTS=`$SWIFTVMBOOT_DIR/bin/gp-instance-describe $SWIFTVM_INSTANCE|sed -r "s/\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]//g"|awk '{print $3}'`
 
    # Start worker script
-   if [ -f "$HOME/.swift/.machines" ]; then
-      rm $HOME/.swift/.machines
+   if [ -f "$HOME/.swift/machines" ]; then
+      rm $HOME/.swift/machines
    fi
    for MACHINE in $WORKER_HOSTS
    do
       # Create a list of machines for other applications, if needed
-      echo $MACHINE >> $HOME/.swift/.machines
+      echo $MACHINE >> $HOME/.swift/machines
 
       # Enable ssh tunneling if needed
       if [ "$SSH_TUNNELING" == "yes" ]; then
@@ -166,8 +167,8 @@
 
    WORKER_HOSTS=$( $SWIFTVMBOOT_DIR/bin/ec2-describe-instances $SWIFTVM_INSTANCES_AS_STRING | grep INSTANCE | grep -v terminated | awk '{print $4}' )
 
-   if [ -f "$HOME/.swift/.machines" ]; then
-      rm $HOME/.swift/.machines
+   if [ -f "$HOME/.swift/machines" ]; then
+      rm $HOME/.swift/machines
    fi
 
    # Start worker script
@@ -176,7 +177,7 @@
    do
 
       # Create a list of machines for other applications, if needed
-      echo $MACHINE >> $HOME/.swift/.machines
+      echo $MACHINE >> $HOME/.swift/machines
 
       # Enable ssh tunneling if needed
       if [ "$SSH_TUNNELING" == "yes" ]; then
@@ -433,7 +434,7 @@
 wrapperlog.always.transfer=false
 execution.retries=0
 provider.staging.pin.swiftfiles=false
-sitedir.keep=true
+sitedir.keep=false
 EOF
 fi
 

Modified: branches/release-0.93/bin/stop-coaster-service
===================================================================
--- branches/release-0.93/bin/stop-coaster-service	2011-12-18 02:19:12 UTC (rev 5432)
+++ branches/release-0.93/bin/stop-coaster-service	2011-12-18 02:38:22 UTC (rev 5433)
@@ -60,8 +60,8 @@
    fi
 fi
 
-if [ -f "$HOME/.swift/.machines" ]; then
-   rm "$HOME/.swift/.machines"
+if [ -f "$HOME/.swift/machines" ]; then
+   rm "$HOME/.swift/machines"
 fi
 
 popd > /dev/null 2>&1