Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Set minimum compatible restart version to 8.1.0.dev #5174

Closed
wants to merge 2 commits into from
Closed

Set minimum compatible restart version to 8.1.0.dev #5174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b8b043c
Set min compat restart version to 8.1.0.dev
MetRonnie Oct 3, 2022
0e8c9cc
Fix changelog
MetRonnie Oct 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ creating a new release entry be sure to copy & paste the span tag with the
`actions:bind` attribute, which is used by a regex to find the text to be
updated. Only the first match gets replaced, so it's fine to leave the old
ones in. -->

-------------------------------------------------------------------------------

## __cylc-8.1.0 (<span actions:bind='release-date'>Upcoming</span>)__
Expand All @@ -28,16 +27,18 @@ ones in. -->
[#5081](https://github.com/cylc/cylc-flow/pull/5081) - Reduced amount that
gets logged at "INFO" level in scheduler logs.

### Fixes

[#5023](https://github.com/cylc/cylc-flow/pull/5023) - tasks force-triggered
after a shutdown was ordered should submit to run immediately on restart.

-------------------------------------------------------------------------------
## __cylc-8.0.3 (<span actions:bind='release-date'>Upcoming</span>)__

Maintenance release.

### Fixes

[#5023](https://github.com/cylc/cylc-flow/pull/5023) - tasks force-triggered
after a shutdown was ordered should submit to run immediately on restart.

[#5137](https://github.com/cylc/cylc-flow/pull/5137) -
Install the `ana/` directory to remote platforms by default.

Expand Down
2 changes: 1 addition & 1 deletion cylc/flow/rundb.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ class CylcWorkflowDAO:
CONN_TIMEOUT = 0.2
DB_FILE_BASE_NAME = "db"
MAX_TRIES = 100
RESTART_INCOMPAT_VERSION = "8.0b3" # Can't restart if <= this version
RESTART_MIN_COMPAT_VERSION = "8.1.0.dev" # Can't restart if < this version
TABLE_BROADCAST_EVENTS = "broadcast_events"
TABLE_BROADCAST_STATES = "broadcast_states"
TABLE_INHERITANCE = "inheritance"
Expand Down
4 changes: 2 additions & 2 deletions cylc/flow/workflow_db_mgr.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -715,9 +715,9 @@ def check_workflow_db_compatibility(self):
pri_dao.close()
last_run_ver = parse_version(last_run_ver)
restart_incompat_ver = parse_version(
CylcWorkflowDAO.RESTART_INCOMPAT_VERSION
CylcWorkflowDAO.RESTART_MIN_COMPAT_VERSION
)
if last_run_ver <= restart_incompat_ver:
if last_run_ver < restart_incompat_ver:
raise ServiceFileError(
f"{incompat_msg} (workflow last run with Cylc {last_run_ver})."
f"\n{manual_rm_msg}"
Expand Down
2 changes: 1 addition & 1 deletion tests/functional/cylc-clean/05-old-remote-contact.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ workflow_run_ok "${TEST_NAME_BASE}-run" cylc play "$WORKFLOW_NAME" --no-detach
# Create a fake old contact file on the remote host
echo | $SSH_CMD "cat > \$HOME/cylc-run/${WORKFLOW_NAME}/.service/contact" << EOF
CYLC_API=5
CYLC_VERSION=8.0.0
CYLC_VERSION=8.1.0
CYLC_WORKFLOW_COMMAND=echo Hello John
CYLC_WORKFLOW_HOST=unreachable.isla_nublar.ingen
CYLC_WORKFLOW_ID=${WORKFLOW_NAME}
Expand Down
2 changes: 1 addition & 1 deletion tests/functional/job-submission/01-job-nn-localhost/db.sqlite3
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ CREATE TABLE inheritance(namespace TEXT, inheritance TEXT, PRIMARY KEY(namespace
INSERT INTO inheritance VALUES('root','["root"]');
INSERT INTO inheritance VALUES('foo','["foo", "root"]');
CREATE TABLE workflow_params(key TEXT, value TEXT, PRIMARY KEY(key));
INSERT INTO workflow_params VALUES('cylc_version', '8.0rc1.dev0');
INSERT INTO workflow_params VALUES('cylc_version', '8.1.0.dev0');
CREATE TABLE workflow_template_vars(key TEXT, value TEXT, PRIMARY KEY(key));
CREATE TABLE task_action_timers(cycle TEXT, name TEXT, ctx_key TEXT, ctx TEXT, delays TEXT, num INTEGER, delay TEXT, timeout TEXT, PRIMARY KEY(cycle, name, ctx_key));
INSERT INTO task_action_timers VALUES('1','foo','"poll_timer"','["tuple", [[99, "running"]]]','[]',0,NULL,NULL);
Expand Down
2 changes: 1 addition & 1 deletion tests/functional/restart/57-ghost-job/db.sqlite3
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ CREATE TABLE workflow_flows(flow_num INTEGER, start_time TEXT, description TEXT,
INSERT INTO workflow_flows VALUES(1,'2022-07-25 16:18:23','original flow from 1');
CREATE TABLE workflow_params(key TEXT, value TEXT, PRIMARY KEY(key));
INSERT INTO workflow_params VALUES('uuid_str','4972bc10-a016-46b0-b313-b10f3cb63bf5');
INSERT INTO workflow_params VALUES('cylc_version','8.0rc4.dev');
INSERT INTO workflow_params VALUES('cylc_version','8.1.0.dev');
INSERT INTO workflow_params VALUES('UTC_mode','0');
INSERT INTO workflow_params VALUES('n_restart','0');
INSERT INTO workflow_params VALUES('cycle_point_tz','Z');
Expand Down