Improve distributed_work stopping with ongoing worker tasks #2369
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
guilhermelawless
requested review from
cryptocode
and removed request for
wezrule
wezrule
reviewed
Oct 29, 2019
Comment on lines
+454
to
+455
| void nano::distributed_work_factory::stop () | ||
| { |
There was a problem hiding this comment.
Should items be cleared at the end of this function? Otherwise in the destructor they can be cancelled again
There was a problem hiding this comment.
Each vector of work is erased in cancel() , but I've added a clear to make sure, and a stopped flag to avoid calling stop() twice or adding new work in make () after stopping
… decision to do the callback for the caller
cryptocode
reviewed
Oct 30, 2019
cryptocode
approved these changes
Oct 30, 2019
wezrule
approved these changes
Oct 30, 2019
argakiig
pushed a commit
that referenced
this pull request
Oct 31, 2019
* Improve distributed_work stopping with ongoing worker tasks * Another const * Fix work_generate_blocking replacing cancelled work with zero-filled work * Make sure items cannot be canceled twice * Simplifying * Protect stopped * Fix ocasionally stuck tests * Return true/false for errors in distributed_work::make(), leaving the decision to do the callback for the caller * Add a comment to clarify
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Found while running RPC
epoch_upgradewhich places the task innano::worker. When preemptively stopping the node (with SIGINT, not RPC "stop") the I/O threads are destroyed and the backgroundwork_generate_blockingtask can't complete if using work peers.This adds manual canceling of all ongoing work before attempting to destroy the
worker.Also fixes an issue where canceled work would turn into zero-filled work, which was only a problem when stopping the node.