Fix platform subshell evaluating more than once for tasks triggered in paused workflow #7035
Conversation
| async def test_trigger_whilst_paused_preparing(flow, scheduler, run, complete): | ||
| """It should run "preparing" tasks even if the workflow is paused. | ||
| Remote init leaves tasks as preparing for a while. These must still be | ||
| pushed through to running, even if triggered while the workflow is paused. |
This comment was marked as outdated.
This comment was marked as outdated.
Sorry, something went wrong.
There was a problem hiding this comment.
Test added back in d3f5f68 since it was changed on 8.6.x
| # Both of these cases should validate ok. | ||
| run_ok "${TEST_NAME_BASE}-validate" \ | ||
| cylc validate "${WORKFLOW_NAME}" | ||
|
|
There was a problem hiding this comment.
I don't think it should validate ok! This is detectable at config parse time, however we are unlikely to fix this now as the deprecated syntax is to be removed in the next minor release
MetRonnie
force-pushed
the
paused-trigger-platform
branch
from
4aea66b to
c2d5048
Compare
MetRonnie
force-pushed
the
paused-trigger-platform
branch
from
c2d5048 to
dfcdcab
Compare
There was a problem hiding this comment.
LGTM @MetRonnie - but I'll leave you to check the conflict with #7054 (huh, this PR is older than that one!)
MetRonnie
force-pushed
the
paused-trigger-platform
branch
from
2564b21 to
d3f5f68
Compare
| pre_prep_tasks.update({ | ||
| itask | ||
| for itask in self.pool.get_tasks() | ||
| if itask.state(TASK_STATUS_PREPARING) | ||
| } | ||
| and itask.waiting_on_job_prep | ||
| }) |
There was a problem hiding this comment.
@oliver-sanders This PR pre-dated #7054 and had basically the same fix.
However #7054 missed L1376 - I have consolidated the two in this PR.
One difference here is that I did not delete the check for itask.state(TASK_STATUS_PREPARING), I added the check for itask.waiting_on_job_prep in addition.
There was a problem hiding this comment.
I don't think there's any need to have itask.state(TASK_STATUS_PREPARING) in combination with itask.waiting_on_job_prep, but it can't do any harm.
- All task proxies that are `waiting_on_job_prep` should be in the preparing state, so remove redundant check - Add back in simple trigger-while-paused integration test
MetRonnie
force-pushed
the
paused-trigger-platform
branch
from
d3f5f68 to
a3ddfc5
Compare
4 participants
Closes #6994
Stop trying to submit the triggered tasks once
itask.waiting_on_job_prep == False.This is kind of a follow-up to #6836, #6768, #6345, #5062. It also predates and fixes the same bug as #7054.
Also fixes a scheduler TypeError crash if platform subshell evaluates to an empty string.
Also fixes an incomplete warning message
Check List
CONTRIBUTING.mdand added my name as a Code Contributor.?.?.xbranch.