[Swift-commit] r2548 - in trunk: libexec tests/misc

[noreply at svn.ci.uchicago.edu]

Author: benc
Date: 2009-02-15 18:05:28 -0600 (Sun, 15 Feb 2009)
New Revision: 2548

Added:
   trunk/tests/misc/wonky-clusters-wrongdir.sh
Modified:
   trunk/libexec/seq.sh
Log:
Make clustering work with executions that do not set initial directory
correctly - the same as r2380 did for wrapper.sh.

Add a test with provider-wonky for this.

Modified: trunk/libexec/seq.sh
===================================================================
--- trunk/libexec/seq.sh	2009-02-16 00:04:35 UTC (rev 2547)
+++ trunk/libexec/seq.sh	2009-02-16 00:05:28 UTC (rev 2548)
@@ -1,7 +1,12 @@
 #!/bin/bash
 
-#WFDIR=$(dirname $(dirname $0))
-#cd $WFDIR
+# get the parent directory of the directory containing wrapper.sh, to use
+# as the run directory
+# this assumes that seq.sh is being executed from the top level of
+# the shared directory, and that shared directory is in the top level
+# of the workflow run directory
+WFDIR=$(dirname $(dirname $0))
+cd $WFDIR
 
 SEQID="$1"
 shift

Added: trunk/tests/misc/wonky-clusters-wrongdir.sh
===================================================================
--- trunk/tests/misc/wonky-clusters-wrongdir.sh	                        (rev 0)
+++ trunk/tests/misc/wonky-clusters-wrongdir.sh	2009-02-16 00:05:28 UTC (rev 2548)
@@ -0,0 +1,35 @@
+#!/bin/bash
+
+# this will turn on clustering.
+
+# TODO need to check that clustering actually gets used.
+#   unsure what the best programmatic way
+# to determine that clustering actually happen is. perhaps look at
+# the cluster log file and see that there is only one of them or
+# run some log analysis to determine the clustering pattern.
+#   or, could prepend a touch onto the start of seq.sh for the
+# duration of this test, and then check that touch later
+
+export CF=swift.properties.no-retries
+
+cat ../language-behaviour/tc.data | sed 's/null$/GLOBUS::maxwalltime="0:1"/' > clusters.tc.data
+
+cd ../language-behaviour
+
+cat $(dirname $(which swift))/../etc/swift.properties | grep --invert-match -E '^clustering.enabled=' | grep --invert-match -E '^clustering.min.time=' | grep --invert-match -E '^execution.retries=' > $CF
+
+echo clustering.enabled=true >> $CF
+echo clustering.min.time=600 >> $CF
+
+# turn of retries, so that if we fail in a cluster, we don't give the
+# engine another chance to run potentially outside of.
+# (in r2541, although clustering is broken, this cluster test can pass
+# because rate limiting eventually takes us down to 1 job at once, which
+# then avoids clustering, and succeeds)
+echo execution.retries=0 >> $CF
+
+export SWIFT_TEST_PARAMS="-config $CF -tc.file ../misc/clusters.tc.data -sites.file ../sites/wonky/wrongdir.xml"
+
+./run 130-fmri
+
+


Property changes on: trunk/tests/misc/wonky-clusters-wrongdir.sh
___________________________________________________________________
Name: svn:executable
   + *