Merge pull request #1929 from matthewrmshin/execution-time-limit

Job execution time limit enhancement
cylc · Jul 25, 2016 · 50cd49e · 50cd49e
2 parents 8f36630 + 5b6e963
commit 50cd49e
Show file tree

Hide file tree

Showing 165 changed files with 1,224 additions and 732 deletions.
diff --git a/bin/cylc-email-suite b/bin/cylc-email-suite
@@ -28,7 +28,7 @@ usage() {
     echo "[cylc]"
     echo "   [[environment]]"
     echo "      MAIL_ADDRESS = foo@bar.baz.waz"
-    echo "   [[event hooks]]"
+    echo "   [[events]]"
     echo "      shutdown handler = cylc email-suite"
     echo ""
     echo "See the Suite.rc Reference (Cylc User Guide) for more information"

diff --git a/bin/cylc-email-task b/bin/cylc-email-task
@@ -30,7 +30,7 @@ usage() {
     echo "      MAIL_ADDRESS = foo@bar.baz.waz"
     echo "[runtime]"
     echo "   [[root]]"
-    echo "      [[[event hooks]]]"
+    echo "      [[[events]]]"
     echo "         failed handler = cylc email-task"
     echo ""
     echo "See the Suite.rc Reference (Cylc User Guide) for more information"

diff --git a/dev/suites/busy/suite.rc b/dev/suites/busy/suite.rc
@@ -26,10 +26,10 @@ description = A suite of 1000 tasks per cycle
             """
 [runtime]
     [[root]]
-        command scripting = sleep 1
-        [[[job submission]]]
-            method = at
-        [[[event hooks]]]
+        script = sleep 1
+        [[[job]]]
+            batch system = at
+        [[[events]]]
             succeeded handler = true
             failed handler = true
             retry handler = true

diff --git a/dev/suites/dave/suite.rc b/dev/suites/dave/suite.rc
@@ -30,11 +30,9 @@ background thread; (c) job submission in a background worker thread."""
     [[root]]
         env-script = "PS4='$(date): ';set -x"
         script = "echo Running on $(hostname) in $PWD; sleep 5"
-        [[[event hooks]]]
-            #succeeded handler = "rose task-hook --mail-if=submission_failed,submission_timeout,execution_timeout"
     [[REMOTE]]
-        [[[job submission]]]
-            method = at
+        [[[job]]]
+            batch system = at
         [[[remote]]]
             #host = els003
             host = $(sleep 5; echo oliverh-33586DL.greta.niwa.co.nz)