-
Notifications
You must be signed in to change notification settings - Fork 94
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.
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
Timeout on restarting completed workflows #5231
Conversation
It might be worth prising apart the restart timer work from the update data store changes included on this branch so that we can get this in sooner. I think the data store changes will require more work, reviewing & testing. |
I must have made those changes for a reason, I don't think they were entirely incidental to the main change. Unfortunately, I've forgotten by now. I'll take a look ... |
7be8709
to
02eb7f4
Compare
(Rebased) |
@oliver-sanders - the new timeout required tweaking the scheduler's datastore-update call slightly. The problem was, the datastore update method itself contained code to figure out if the datastore actually needs updating. It was easier to accommodate the new change (and it makes more sense too) to have the method just update the datastore, and decide whether or not to call it one level up in the stack. So it's a small change - I just moved that code out into the caller. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fixed - by not attempting to poll tasks on restart if the task pool is empty. |
(Temporarily reverting to DRAFT while I investigate something ...) |
Find anything? |
Added an integration test here - hjoliver#33 |
restart timeout: add integration test
Sorry, I no longer recall what in hell I was talking about there. I have a vague feeling I was testing something else that I thought might affect this branch, but I guess I got distracted and didn't get back to this. I took another quick scan through this change though and I can't see anything wrong with it. Plus, it works. Merged your side PR @oliver-sanders - plz take over this PR while I'm away... |
Co-authored-by: Ronnie Dutta <61982285+MetRonnie@users.noreply.github.com>
This has the potential to interact with #5592 which was merged after this branch was forked. Likely test failures, should do a manual test jamming in sleeps to make the reload appear slow (see PR for details) to ensure that is still working. |
Nope, went through fine, I've tested reload with sleeps jammed in and it appears to have worked well. |
(plz squash merge) |
1 unresolved comment: #5231 (comment) |
Co-authored-by: Ronnie Dutta <61982285+MetRonnie@users.noreply.github.com>
(Pressed the commit button) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
I have carried out the tests described, and also run the integration and |
Close #5078
scheduler.update_data_structure()
)Check List
CONTRIBUTING.md
and added my name as a Code Contributor.setup.cfg
andconda-environment.yml
.CHANGES.md
entry included if this is a change that can affect users?.?.x
branch.