[Swift-commit] r4531 - in trunk: etc tests tests/providers tests/providers/persistent-coasters tests/providers/persistent-coasters/mcs

davidk at ci.uchicago.edu davidk at ci.uchicago.edu
Fri May 27 09:51:13 CDT 2011 

Author: davidk
Date: 2011-05-27 09:51:12 -0500 (Fri, 27 May 2011)
New Revision: 4531

Added:
   trunk/tests/providers/persistent-coasters/
   trunk/tests/providers/persistent-coasters/mcs/
   trunk/tests/providers/persistent-coasters/mcs/001-catsn.check.sh
   trunk/tests/providers/persistent-coasters/mcs/001-catsn.clean.sh
   trunk/tests/providers/persistent-coasters/mcs/001-catsn.setup.sh
   trunk/tests/providers/persistent-coasters/mcs/001-catsn.swift
   trunk/tests/providers/persistent-coasters/mcs/001-catsn.timeout
   trunk/tests/providers/persistent-coasters/mcs/README
   trunk/tests/providers/persistent-coasters/mcs/catsn.0001.out.expected
   trunk/tests/providers/persistent-coasters/mcs/catsn.0002.out.expected
   trunk/tests/providers/persistent-coasters/mcs/catsn.0003.out.expected
   trunk/tests/providers/persistent-coasters/mcs/catsn.0004.out.expected
   trunk/tests/providers/persistent-coasters/mcs/catsn.0005.out.expected
   trunk/tests/providers/persistent-coasters/mcs/catsn.0006.out.expected
   trunk/tests/providers/persistent-coasters/mcs/catsn.0007.out.expected
   trunk/tests/providers/persistent-coasters/mcs/catsn.0008.out.expected
   trunk/tests/providers/persistent-coasters/mcs/catsn.0009.out.expected
   trunk/tests/providers/persistent-coasters/mcs/catsn.0010.out.expected
   trunk/tests/providers/persistent-coasters/mcs/coaster-service.conf
   trunk/tests/providers/persistent-coasters/mcs/data.txt
   trunk/tests/providers/persistent-coasters/mcs/sites.template.xml
   trunk/tests/providers/persistent-coasters/mcs/tc.template.data
   trunk/tests/providers/persistent-coasters/mcs/title.txt
Modified:
   trunk/etc/coaster-service.conf
   trunk/tests/suite.sh
Log:
Provider tests for persistent coasters on MCS machines over ssh


Modified: trunk/etc/coaster-service.conf
===================================================================
--- trunk/etc/coaster-service.conf	2011-05-25 20:53:04 UTC (rev 4530)
+++ trunk/etc/coaster-service.conf	2011-05-27 14:51:12 UTC (rev 4531)
@@ -14,7 +14,7 @@
 export WORKER_LOGGING=INFO
 
 # Worker host names for ssh
-export WORKERS_HOSTS="host1 host2 host3"
+export WORKER_HOSTS="host1 host2 host3"
 
 # Directory to keep log files, relative to working directory when launching start-coaster-service
 export LOG_DIR=logs

Added: trunk/tests/providers/persistent-coasters/mcs/001-catsn.check.sh
===================================================================
--- trunk/tests/providers/persistent-coasters/mcs/001-catsn.check.sh	                        (rev 0)
+++ trunk/tests/providers/persistent-coasters/mcs/001-catsn.check.sh	2011-05-27 14:51:12 UTC (rev 4531)
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+set -x
+
+for count in `seq --format "%04.f" 1 1 10`
+do
+	[ -f catsn.$count.out ] || exit 1
+	CONTENTS1=$( cat catsn.$count.out.expected )
+	CONTENTS2=$( cat catsn.$count.out )
+	[[ $CONTENTS1 == $CONTENTS2 ]] || exit 1
+done
+exit 0


Property changes on: trunk/tests/providers/persistent-coasters/mcs/001-catsn.check.sh
___________________________________________________________________
Added: svn:executable
   + *

Added: trunk/tests/providers/persistent-coasters/mcs/001-catsn.clean.sh
===================================================================
--- trunk/tests/providers/persistent-coasters/mcs/001-catsn.clean.sh	                        (rev 0)
+++ trunk/tests/providers/persistent-coasters/mcs/001-catsn.clean.sh	2011-05-27 14:51:12 UTC (rev 4531)
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+stop-coaster-service
+


Property changes on: trunk/tests/providers/persistent-coasters/mcs/001-catsn.clean.sh
___________________________________________________________________
Added: svn:executable
   + *

Added: trunk/tests/providers/persistent-coasters/mcs/001-catsn.setup.sh
===================================================================
--- trunk/tests/providers/persistent-coasters/mcs/001-catsn.setup.sh	                        (rev 0)
+++ trunk/tests/providers/persistent-coasters/mcs/001-catsn.setup.sh	2011-05-27 14:51:12 UTC (rev 4531)
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+cp -v $GROUP/data.txt . || exit 1
+cp -v $GROUP/*expected . || exit 1
+start-coaster-service || exit 1


Property changes on: trunk/tests/providers/persistent-coasters/mcs/001-catsn.setup.sh
___________________________________________________________________
Added: svn:executable
   + *

Added: trunk/tests/providers/persistent-coasters/mcs/001-catsn.swift
===================================================================
--- trunk/tests/providers/persistent-coasters/mcs/001-catsn.swift	                        (rev 0)
+++ trunk/tests/providers/persistent-coasters/mcs/001-catsn.swift	2011-05-27 14:51:12 UTC (rev 4531)
@@ -0,0 +1,12 @@
+type file;
+
+app (file o) cat (file i)
+{
+  cat @i stdout=@o;
+}
+
+file out[]<simple_mapper; location=".", prefix="catsn.",suffix=".out">;
+foreach j in [1:@toint(@arg("n","10"))] {
+  file data<"data.txt">;
+  out[j] = cat(data);
+}

Added: trunk/tests/providers/persistent-coasters/mcs/001-catsn.timeout
===================================================================
--- trunk/tests/providers/persistent-coasters/mcs/001-catsn.timeout	                        (rev 0)
+++ trunk/tests/providers/persistent-coasters/mcs/001-catsn.timeout	2011-05-27 14:51:12 UTC (rev 4531)
@@ -0,0 +1 @@
+180

Added: trunk/tests/providers/persistent-coasters/mcs/README
===================================================================
--- trunk/tests/providers/persistent-coasters/mcs/README	                        (rev 0)
+++ trunk/tests/providers/persistent-coasters/mcs/README	2011-05-27 14:51:12 UTC (rev 4531)
@@ -0,0 +1 @@
+Before running this test, be sure to copy coaster-service.conf to your swift etc directory

Added: trunk/tests/providers/persistent-coasters/mcs/catsn.0001.out.expected
===================================================================
--- trunk/tests/providers/persistent-coasters/mcs/catsn.0001.out.expected	                        (rev 0)
+++ trunk/tests/providers/persistent-coasters/mcs/catsn.0001.out.expected	2011-05-27 14:51:12 UTC (rev 4531)
@@ -0,0 +1 @@
+Hello world

Added: trunk/tests/providers/persistent-coasters/mcs/catsn.0002.out.expected
===================================================================
--- trunk/tests/providers/persistent-coasters/mcs/catsn.0002.out.expected	                        (rev 0)
+++ trunk/tests/providers/persistent-coasters/mcs/catsn.0002.out.expected	2011-05-27 14:51:12 UTC (rev 4531)
@@ -0,0 +1 @@
+Hello world

Added: trunk/tests/providers/persistent-coasters/mcs/catsn.0003.out.expected
===================================================================
--- trunk/tests/providers/persistent-coasters/mcs/catsn.0003.out.expected	                        (rev 0)
+++ trunk/tests/providers/persistent-coasters/mcs/catsn.0003.out.expected	2011-05-27 14:51:12 UTC (rev 4531)
@@ -0,0 +1 @@
+Hello world

Added: trunk/tests/providers/persistent-coasters/mcs/catsn.0004.out.expected
===================================================================
--- trunk/tests/providers/persistent-coasters/mcs/catsn.0004.out.expected	                        (rev 0)
+++ trunk/tests/providers/persistent-coasters/mcs/catsn.0004.out.expected	2011-05-27 14:51:12 UTC (rev 4531)
@@ -0,0 +1 @@
+Hello world

Added: trunk/tests/providers/persistent-coasters/mcs/catsn.0005.out.expected
===================================================================
--- trunk/tests/providers/persistent-coasters/mcs/catsn.0005.out.expected	                        (rev 0)
+++ trunk/tests/providers/persistent-coasters/mcs/catsn.0005.out.expected	2011-05-27 14:51:12 UTC (rev 4531)
@@ -0,0 +1 @@
+Hello world

Added: trunk/tests/providers/persistent-coasters/mcs/catsn.0006.out.expected
===================================================================
--- trunk/tests/providers/persistent-coasters/mcs/catsn.0006.out.expected	                        (rev 0)
+++ trunk/tests/providers/persistent-coasters/mcs/catsn.0006.out.expected	2011-05-27 14:51:12 UTC (rev 4531)
@@ -0,0 +1 @@
+Hello world

Added: trunk/tests/providers/persistent-coasters/mcs/catsn.0007.out.expected
===================================================================
--- trunk/tests/providers/persistent-coasters/mcs/catsn.0007.out.expected	                        (rev 0)
+++ trunk/tests/providers/persistent-coasters/mcs/catsn.0007.out.expected	2011-05-27 14:51:12 UTC (rev 4531)
@@ -0,0 +1 @@
+Hello world

Added: trunk/tests/providers/persistent-coasters/mcs/catsn.0008.out.expected
===================================================================
--- trunk/tests/providers/persistent-coasters/mcs/catsn.0008.out.expected	                        (rev 0)
+++ trunk/tests/providers/persistent-coasters/mcs/catsn.0008.out.expected	2011-05-27 14:51:12 UTC (rev 4531)
@@ -0,0 +1 @@
+Hello world

Added: trunk/tests/providers/persistent-coasters/mcs/catsn.0009.out.expected
===================================================================
--- trunk/tests/providers/persistent-coasters/mcs/catsn.0009.out.expected	                        (rev 0)
+++ trunk/tests/providers/persistent-coasters/mcs/catsn.0009.out.expected	2011-05-27 14:51:12 UTC (rev 4531)
@@ -0,0 +1 @@
+Hello world

Added: trunk/tests/providers/persistent-coasters/mcs/catsn.0010.out.expected
===================================================================
--- trunk/tests/providers/persistent-coasters/mcs/catsn.0010.out.expected	                        (rev 0)
+++ trunk/tests/providers/persistent-coasters/mcs/catsn.0010.out.expected	2011-05-27 14:51:12 UTC (rev 4531)
@@ -0,0 +1 @@
+Hello world

Added: trunk/tests/providers/persistent-coasters/mcs/coaster-service.conf
===================================================================
--- trunk/tests/providers/persistent-coasters/mcs/coaster-service.conf	                        (rev 0)
+++ trunk/tests/providers/persistent-coasters/mcs/coaster-service.conf	2011-05-27 14:51:12 UTC (rev 4531)
@@ -0,0 +1,33 @@
+# Keep all interesting settings in one place
+# User should modify this to fit environment
+
+# Location of SWIFT. If empty, PATH is referenced
+export SWIFT=
+
+# Where to place/launch worker.pl on the remote machine for sites.xml
+export WORKER_WORK=/home/${USER}/work
+
+# How to launch workers: local, ssh, or cobalt
+export WORKER_MODE=ssh
+
+# Worker logging setting passed to worker.pl for sites.xml
+export WORKER_LOGGING=INFO
+
+# Worker host names for ssh
+export WORKER_HOSTS="crush.mcs.anl.gov thwomp.mcs.anl.gov stomp.mcs.anl.gov crank.mcs.anl.gov steamroller.mcs.anl.gov grind.mcs.anl.gov churn.mcs.anl.gov trounce.mcs.anl.gov thrash.mcs.anl.gov vanquish.mcs.anl.gov"
+
+# Directory to keep log files, relative to working directory when launching start-coaster-service
+export LOG_DIR=logs
+
+# Manually define ports. If not specified, ports will be automatically generated
+export LOCAL_PORT=
+export SERVICE_PORT=
+
+# start-coaster-service tries to automatically detect IP address. Specify here if auto detection is not working correctly
+export IPADDR=
+
+# Below are various settings to give information about how to create sites.xml
+export work=$HOME/work
+export queue=prod-devel
+export maxtime=20
+export nodes=64

Added: trunk/tests/providers/persistent-coasters/mcs/data.txt
===================================================================
--- trunk/tests/providers/persistent-coasters/mcs/data.txt	                        (rev 0)
+++ trunk/tests/providers/persistent-coasters/mcs/data.txt	2011-05-27 14:51:12 UTC (rev 4531)
@@ -0,0 +1 @@
+Hello world

Added: trunk/tests/providers/persistent-coasters/mcs/sites.template.xml
===================================================================
--- trunk/tests/providers/persistent-coasters/mcs/sites.template.xml	                        (rev 0)
+++ trunk/tests/providers/persistent-coasters/mcs/sites.template.xml	2011-05-27 14:51:12 UTC (rev 4531)
@@ -0,0 +1,13 @@
+<config>
+  <pool handle="persistent-coasters">
+    <execution provider="coaster-persistent"
+               url="_EXECUTION_URL_"
+               jobmanager="local:local"/>
+    <profile namespace="globus" key="workerManager">passive</profile>
+    <profile namespace="globus" key="workersPerNode">4</profile>
+    <profile key="jobThrottle" namespace="karajan">.03</profile>
+    <profile namespace="karajan" key="initialScore">10000</profile>
+    <filesystem provider="local" url="none" />
+    <workdirectory>_WORK_</workdirectory>
+  </pool>
+</config>


Property changes on: trunk/tests/providers/persistent-coasters/mcs/sites.template.xml
___________________________________________________________________
Added: svn:executable
   + *

Added: trunk/tests/providers/persistent-coasters/mcs/tc.template.data
===================================================================
--- trunk/tests/providers/persistent-coasters/mcs/tc.template.data	                        (rev 0)
+++ trunk/tests/providers/persistent-coasters/mcs/tc.template.data	2011-05-27 14:51:12 UTC (rev 4531)
@@ -0,0 +1,7 @@
+persistent-coasters 	echo 		/bin/echo	INSTALLED	INTEL32::LINUX
+persistent-coasters 	cat 		/bin/cat	INSTALLED	INTEL32::LINUX
+persistent-coasters 	ls 		/bin/ls		INSTALLED	INTEL32::LINUX
+persistent-coasters 	grep 		/bin/grep	INSTALLED	INTEL32::LINUX
+persistent-coasters 	sort 		/bin/sort	INSTALLED	INTEL32::LINUX
+persistent-coasters 	paste 		/bin/paste	INSTALLED	INTEL32::LINUX
+persistent-coasters	wc		/usr/bin/wc	INSTALLED	INTEL32::LINUX

Added: trunk/tests/providers/persistent-coasters/mcs/title.txt
===================================================================
--- trunk/tests/providers/persistent-coasters/mcs/title.txt	                        (rev 0)
+++ trunk/tests/providers/persistent-coasters/mcs/title.txt	2011-05-27 14:51:12 UTC (rev 4531)
@@ -0,0 +1 @@
+MCS Machines with Persistent Coasters and SSH

Modified: trunk/tests/suite.sh
===================================================================
--- trunk/tests/suite.sh	2011-05-25 20:53:04 UTC (rev 4530)
+++ trunk/tests/suite.sh	2011-05-27 14:51:12 UTC (rev 4531)
@@ -892,6 +892,7 @@
     echo "s at _HOST_@$GLOBUS_HOSTNAME@"
     echo "s at _PROJECT_@$PROJECT@"
     echo "s at _QUEUE_@$QUEUE@"
+    echo "s at _EXECUTION_URL_@$EXECUTION_URL@"
   } > $RUNDIR/sites.sed
   return 0
 }

More information about the Swift-commit mailing list