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

Constrain window by final cycle point #4272

Merged
merged 1 commit into from
Jun 21, 2021
Merged

Constrain window by final cycle point #4272

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,9 @@ workflow's public database file was not closed properly.

### Fixes

[#4272](https://github.com/cylc/cylc-flow/pull/4272) - Workflow visualisation
data (data-store) now constrained by final cycle point.

[#4248](https://github.com/cylc/cylc-flow/pull/4248)
- Fix parameter expansion in inherited task environments.

Expand Down
3 changes: 3 additions & 0 deletions cylc/flow/data_store_mgr.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -698,7 +698,10 @@ def _expand_graph_window(
self, s_id, s_node, items, active_id, flow_label, reflow,
edge_distance, descendant=False, is_parent=False):
"""Construct nodes/edges for children/parents of source node."""
final_point = self.schd.config.final_point
for t_name, t_point, _ in items:
if t_point > final_point:
continue
oliver-sanders marked this conversation as resolved.
Show resolved Hide resolved
t_node = f'{t_name}.{t_point}'
t_id = (
f'{self.workflow_id}{ID_DELIM}{t_point}{ID_DELIM}{t_name}')
Expand Down
6 changes: 3 additions & 3 deletions tests/functional/graphql/01-workflow.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,8 @@ cmp_json "${TEST_NAME}-out" "${TEST_NAME_BASE}-workflows.stdout" << __HERE__
"title": "foo",
"description": "bar"
},
"newestActiveCyclePoint": "1",
"oldestActiveCyclePoint": "1",
"newestActiveCyclePoint": "20210101T0000Z",
"oldestActiveCyclePoint": "20210101T0000Z",
"reloaded": false,
"runMode": "live",
"stateTotals": {
Expand All @@ -117,7 +117,7 @@ cmp_json "${TEST_NAME}-out" "${TEST_NAME_BASE}-workflows.stdout" << __HERE__
],
"states": ["waiting"],
"latestStateTasks": {
"waiting": ["foo.1"]
"waiting": ["foo.20210101T0000Z"]
}
}
]
Expand Down
4 changes: 3 additions & 1 deletion tests/functional/graphql/01-workflow/flow.cylc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,10 @@
UTC mode = True

[scheduling]
initial cycle point = 20210101T0000Z
final cycle point = 20210101T0000Z
[[graph]]
R1 = foo
P1Y = foo[-P1Y] => foo

[runtime]
[[foo]]
Expand Down
2 changes: 0 additions & 2 deletions tests/functional/runahead/06-release-update.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,7 @@ poll_grep_workflow_log -F "spawned bar.${NEXT1}"
sleep 10
cylc dump -t "${WORKFLOW_NAME}" | awk '{print $1 $2 $3}' >'log'
cmp_ok 'log' - <<__END__
bar,$YYYY,succeeded,
bar,$NEXT1,waiting,
foo,$YYYY,succeeded,
foo,$NEXT1,waiting,
__END__

Expand Down