-
Notifications
You must be signed in to change notification settings - Fork 94
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix broadcast submission timeout restart
Suites were dying on restart when there is a submission timeout broadcast. On restart, submission timeout values became unicode, which caused job submission timeout logic to die. This fix ensures that the values are converted back to float.
- Loading branch information
1 parent
d6c4d33
commit b839795
Showing
4 changed files
with
55 additions
and
7 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
#!/bin/bash | ||
# THIS FILE IS PART OF THE CYLC SUITE ENGINE. | ||
# Copyright (C) 2008-2017 NIWA | ||
# | ||
# 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/>. | ||
#------------------------------------------------------------------------------- | ||
# Test restart with broadcast to "[events]submission timeout". | ||
. "$(dirname "$0")/test_header" | ||
set_test_number 4 | ||
install_suite "${TEST_NAME_BASE}" "${TEST_NAME_BASE}" | ||
|
||
run_ok "${TEST_NAME_BASE}-validate" cylc validate "${SUITE_NAME}" | ||
suite_run_ok "${TEST_NAME_BASE}-run" cylc run "${SUITE_NAME}" --debug | ||
sqlite3 "${SUITE_RUN_DIR}/log/db" \ | ||
'SELECT * FROM broadcast_states' >'sqlite3.out' | ||
cmp_ok 'sqlite3.out' <<<'*|root|[events]submission timeout|60.0' | ||
suite_run_ok "${TEST_NAME_BASE}-restart" \ | ||
cylc restart "${SUITE_NAME}" --debug --reference-test | ||
purge_suite "${SUITE_NAME}" | ||
exit |
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,3 @@ | ||
2017-03-02T20:25:55Z INFO - Initial point: 1 | ||
2017-03-02T20:25:55Z INFO - Final point: 1 | ||
2017-03-02T20:25:55Z INFO - [bar.1] -triggered off ['foo.1'] |
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,14 @@ | ||
[cylc] | ||
UTC mode = True | ||
cycle point format = %Y | ||
[scheduling] | ||
[[dependencies]] | ||
graph = foo => bar | ||
[runtime] | ||
[[foo]] | ||
script=""" | ||
cylc broadcast "${CYLC_SUITE_NAME}" --set='[events]submission timeout=PT1M' | ||
cylc stop "${CYLC_SUITE_NAME}" | ||
""" | ||
[[bar]] | ||
script=true |