forked from cylc/cylc-flow
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request cylc#5096 from wxtim/8.0.x.patch
8.0.x.patch
- Loading branch information
Showing
7 changed files
with
139 additions
and
21 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| #!/bin/bash | ||
| # THIS FILE IS PART OF THE CYLC WORKFLOW ENGINE. | ||
| # Copyright (C) NIWA & British Crown (Met Office) & Contributors. | ||
| # | ||
| # This program is free software: you can redistribute it and/or modify | ||
| # it under the terms of the GNU General Public License as published by | ||
| # the Free Software Foundation, either version 3 of the License, or | ||
| # (at your option) any later version. | ||
| # | ||
| # This program is distributed in the hope that it will be useful, | ||
| # but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| # GNU General Public License for more details. | ||
| # | ||
| # You should have received a copy of the GNU General Public License | ||
| # along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| #------------------------------------------------------------------------------- | ||
|
|
||
| # GitHub 5067: if a task is removed from the graph after shutdown, it should not | ||
| # cause an error at restart. If it was a failed incomplete task, however, it | ||
| # should still be polled and logged at restart. | ||
|
|
||
| . "$(dirname "$0")/test_header" | ||
|
|
||
| set_test_number 7 | ||
|
|
||
| install_workflow "${TEST_NAME_BASE}" "${TEST_NAME_BASE}" | ||
|
|
||
| run_ok "${TEST_NAME_BASE}-validate" cylc validate --set="INCL_B_C=True" "${WORKFLOW_NAME}" | ||
| run_ok "${TEST_NAME_BASE}-validate" cylc validate --set="INCL_B_C=False" "${WORKFLOW_NAME}" | ||
|
|
||
| TEST_NAME="${TEST_NAME_BASE}-run" | ||
| workflow_run_ok "${TEST_NAME}" cylc play -n "${WORKFLOW_NAME}" | ||
|
|
||
| # Restart with removed tasks should not cause an error. | ||
| # It should shut down cleanly after orphaned task a and incomplete failed task | ||
| # b are polled (even though b has been removed from the graph) and a finishes | ||
| # (after checking the poll results). | ||
| TEST_NAME="${TEST_NAME_BASE}-restart" | ||
| workflow_run_ok "${TEST_NAME}" cylc play --set="INCL_B_C=False" -n "${WORKFLOW_NAME}" | ||
|
|
||
| grep_workflow_log_ok "grep-3" "\[1/a running job:01 flows:1\] (polled)started" | ||
| grep_workflow_log_ok "grep-4" "\[1/b failed job:01 flows:1\] (polled)failed" | ||
|
|
||
| # Failed (but not incomplete) task c should not have been polled. | ||
| grep_fail "\[1/c failed job:01 flows:1\] (polled)failed" "${WORKFLOW_RUN_DIR}/log/scheduler/log" | ||
|
|
||
| purge |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| #!Jinja2 | ||
|
|
||
| # Task a shuts the scheduler down cleanly with --now after b and c have failed. | ||
| # On restart, a waits for a and b to be polled before finishing (otherwise we | ||
| # could shut down before poll results come in). | ||
|
|
||
| {% set INCL_B_C = INCL_B_C | default(True) %} | ||
| [scheduler] | ||
| [[events]] | ||
| stall timeout = PT0S | ||
| abort on stall timeout = True | ||
| inactivity timeout = PT30S | ||
| abort on inactivity timeout = True | ||
| [scheduling] | ||
| [[graph]] | ||
| R1 = """ | ||
| a | ||
| {% if INCL_B_C %} | ||
| b & c? | ||
| {% endif %} | ||
| """ | ||
| [runtime] | ||
| [[a]] | ||
| script = """ | ||
| cylc__job__poll_grep_workflow_log "1/b .*failed" | ||
| cylc__job__poll_grep_workflow_log "1/c .*failed" | ||
| cylc stop --now $CYLC_WORKFLOW_ID | ||
| cylc__job__poll_grep_workflow_log "1/a .*(polled)started" | ||
| cylc__job__poll_grep_workflow_log "1/b .*(polled)failed" | ||
| """ | ||
| [[b, c]] | ||
| script = "false" |