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

add owner@host for SUCCEEDED and FAILED tasks #5016

Merged
merged 2 commits into from
Aug 12, 2022
Merged

add owner@host for SUCCEEDED and FAILED tasks #5016

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
52f1ac4
add owner@host for SUCCEEDED and FAILED tasks
wxtim Jul 26, 2022
49cc4dc
Update CHANGES.md
wxtim Jul 29, 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
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 @@ -26,6 +26,9 @@ management and does not bundle Jinja2.

### Fixes

[#5016](https://github.com/cylc/cylc-flow/pull/5016) - fix bug where
polling failure on restart would cause Cylc to assume task is running.

[#4838](https://github.com/cylc/cylc-flow/pull/4838) - fix bug where Cylc 7
would still be able to run a `suite.rc` workflow previously run with Cylc 8.

Expand Down
10 changes: 5 additions & 5 deletions lib/cylc/task_pool.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,10 @@ def load_db_task_pool_for_restart(self, row_idx, row):
except Exception:
LOG.exception('could not load task %s' % name)
else:
if status in (TASK_STATUS_SUBMITTED, TASK_STATUS_RUNNING):
if status in (
TASK_STATUS_SUBMITTED, TASK_STATUS_RUNNING, TASK_STATUS_FAILED,
TASK_STATUS_SUCCEEDED
):
itask.state.set_prerequisites_all_satisfied()
# update the task proxy with user@host
try:
Expand All @@ -374,7 +377,7 @@ def load_db_task_pool_for_restart(self, row_idx, row):
if timeout is not None:
itask.timeout = timeout

elif status in (TASK_STATUS_SUBMIT_FAILED, TASK_STATUS_FAILED):
elif status in (TASK_STATUS_SUBMIT_FAILED):
itask.state.set_prerequisites_all_satisfied()

elif status in (TASK_STATUS_QUEUED, TASK_STATUS_READY):
Expand All @@ -385,9 +388,6 @@ def load_db_task_pool_for_restart(self, row_idx, row):
elif status in (TASK_STATUS_SUBMIT_RETRYING, TASK_STATUS_RETRYING):
itask.state.set_prerequisites_all_satisfied()

elif status == TASK_STATUS_SUCCEEDED:
itask.state.set_prerequisites_all_satisfied()

itask.state.reset_state(status)

# Running or finished task can have completed custom outputs.
Expand Down