[Swift-commit] r5790 - in trunk: bin tests/sites tests/sites/osg

[davidk at ci.uchicago.edu]

Author: davidk
Date: 2012-05-22 07:27:09 -0500 (Tue, 22 May 2012)
New Revision: 5790

Added:
   trunk/tests/sites/osg/
   trunk/tests/sites/osg/coaster-service.conf
Modified:
   trunk/bin/start-coaster-service
   trunk/bin/stop-coaster-service
Log:
Integrate gwms scripts with coaster-service scripts
Added a test configuration for osg which uses the worker.pl init command to symlink work directory


Modified: trunk/bin/start-coaster-service
===================================================================
--- trunk/bin/start-coaster-service	2012-05-11 17:47:42 UTC (rev 5789)
+++ trunk/bin/start-coaster-service	2012-05-22 12:27:09 UTC (rev 5790)
@@ -265,7 +265,7 @@
    if [ -z "$PORT" ]; then
       crash "start-workers-local: Port number not specified, giving up"
    fi
-   echo Starting worker on local machine
+   echo Starting workers
 
    if [ -z "$CONDOR_WORKERS" ]; then
       crash "CONDOR_WORKERS undefined - please check coaster-service.conf"
@@ -286,6 +286,25 @@
    return 0
 }
 
+# Start GWMS workers
+start-workers-gwms()
+{
+   PORT=$1
+   EXECUTION_URL=http://$IPADDR:$PORT
+
+   if [ -z "$PORT" ]; then
+      crash "start-workers-local: Port number not specified, giving up"
+   fi
+
+   if [ -z "$CONDOR_WORKERS" ]; then
+      crash "CONDOR_WORKERS undefined - please check coaster-service.conf"
+   fi
+
+   echo Starting workers   
+   mkdir -p condor
+   run-gwms-workers $EXECUTION_URL $CONDOR_WORKERS > gwms-workers.log 2>&1 &
+}
+
 # Start cobalt workers
 start-workers-cobalt()
 {
@@ -477,6 +496,9 @@
    condor)
       start-workers-condor $LOCAL_PORT
       ;;
+   gwms)
+      start-workers-gwms $LOCAL_PORT
+      ;;
    *)
       crash "Unknown WORKER_MODE. Please modify coaster-service.conf"
       ;;

Modified: trunk/bin/stop-coaster-service
===================================================================
--- trunk/bin/stop-coaster-service	2012-05-11 17:47:42 UTC (rev 5789)
+++ trunk/bin/stop-coaster-service	2012-05-22 12:27:09 UTC (rev 5790)
@@ -60,7 +60,7 @@
    fi
 fi
 
-if [ "$WORKER_MODE" == "condor" ]; then
+if [ "$WORKER_MODE" == "condor" ] || [ "$WORKER_MODE" == "gwms" ]; then
    condor_rm $USER
 fi
 

Added: trunk/tests/sites/osg/coaster-service.conf
===================================================================
--- trunk/tests/sites/osg/coaster-service.conf	                        (rev 0)
+++ trunk/tests/sites/osg/coaster-service.conf	2012-05-22 12:27:09 UTC (rev 5790)
@@ -0,0 +1,40 @@
+# Location of SWIFT. If empty, PATH is searched
+export SWIFT=
+
+# Where to copy worker.pl on the remote machine for sites.xml
+export IPADDR=engage-submit3.renci.org
+
+# Make sure we always use $OSG_WN_TMP as our work directory
+export WORKER_INIT_CMD="ln -s \$OSG_WN_TMP /tmp/osg_wn_tmp"
+
+# How to launch workers: local, ssh, cobalt, or futuregrid
+export WORKER_MODE=gwms
+export CONDOR_WORKERS=1
+
+# Do all the worker nodes you're using have a shared filesystem? (yes/no)
+export SHARED_FILESYSTEM=no
+
+# Enable SSH tunneling? (yes/no)
+export SSH_TUNNELING=no
+
+# Directory to keep log files, relative to working directory when launching start-coaster-service
+export LOG_DIR=logs
+
+# Manually define ports. If not specified, an available port will be used
+export LOCAL_PORT=
+export SERVICE_PORT=
+
+# Swift information for creating sites.xml
+export WORK=/tmp/osg_wn_tmp
+
+# Jobs per node is usually equal to the number of CPUs per node
+export JOBS_PER_NODE=1
+
+# To calculate job throttle:
+# jobs per node * nodes - 0.1 / 100
+export JOB_THROTTLE=$( echo "scale=5; ($JOBS_PER_NODE * $CONDOR_WORKERS)/100 - 0.00001"|bc )
+
+# Swift applications
+#app bash=/bin/bash
+#app cat=/bin/cat
+#app echo=/bin/echo