Simplify ClusterStateUpdateTask Timeout Handling #64117
Merged
Conversation
This file contains hidden or 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
It's confusing and slightly error prone (see elastic#64116) to handle the timeouts via overrides but the priority via a field. This simplifies the code to to avoid future issues and save over 100 LOC.
original-brownbear
added
>non-issue
:Distributed Coordination/Cluster Coordination
|
Pinging @elastic/es-distributed (:Distributed/Cluster Coordination) |
elasticmachine
added
the
Team:Distributed (Obsolete)
…-update-timeout-handling
henningandersen
approved these changes
Oct 28, 2020
| @@ -105,7 +105,8 @@ public void onTimeout(TimeValue timeout) { | |||
|
|
|||
| private void submitClearVotingConfigExclusionsTask(ClearVotingConfigExclusionsRequest request, long startTimeMillis, | |||
| ActionListener<ClearVotingConfigExclusionsResponse> listener) { | |||
| clusterService.submitStateUpdateTask("clear-voting-config-exclusions", new ClusterStateUpdateTask(Priority.URGENT) { | |||
| clusterService.submitStateUpdateTask("clear-voting-config-exclusions", new ClusterStateUpdateTask(Priority.URGENT, | |||
| TimeValue.timeValueMillis(request.getTimeout().millis() + startTimeMillis - threadPool.relativeTimeInMillis())) { | |||
There was a problem hiding this comment.
This seems unsafe in that it could be negative and cause an exception. Your change reduces the risk of that, but I wonder if we should fix it in this same PR?
There was a problem hiding this comment.
I pushed 5897ae9, that should give us a consistent (as in same as when the update would timeout on the queue) exception here I think.
| @@ -105,7 +106,13 @@ public void onTimeout(TimeValue timeout) { | |||
|
|
|||
| private void submitClearVotingConfigExclusionsTask(ClearVotingConfigExclusionsRequest request, long startTimeMillis, | |||
| ActionListener<ClearVotingConfigExclusionsResponse> listener) { | |||
| clusterService.submitStateUpdateTask("clear-voting-config-exclusions", new ClusterStateUpdateTask(Priority.URGENT) { | |||
| final long timeout = request.getTimeout().millis() + startTimeMillis - threadPool.relativeTimeInMillis(); | |||
There was a problem hiding this comment.
I wonder if we should just do Math.max(0, timeout) instead, just like in cluster health action? Seems like the right place to handle timeout=0 is inside submitStateUpdateTask, rather than special handle it here?
There was a problem hiding this comment.
++ I pushed 91e5fb3
henningandersen
approved these changes
Oct 28, 2020
|
Thanks Henning, I updated the description :) |
original-brownbear
added a commit
to original-brownbear/elasticsearch
that referenced
this pull request
Oct 28, 2020
It's confusing and slightly error prone (see elastic#64116) to handle the timeouts via overrides but the priority via a field. This simplifies the code to to avoid future issues and save over 100 LOC. Also this fixes a bug in `TransportVotingConfigExclusionsAction` where trying to instantiate a time value with a negative time could throw and unexpected exception and as a result leak a listener.
original-brownbear
added a commit
that referenced
this pull request
Oct 29, 2020
It's confusing and slightly error prone (see #64116) to handle the timeouts via overrides but the priority via a field. This simplifies the code to to avoid future issues and save over 100 LOC. Also this fixes a bug in `TransportVotingConfigExclusionsAction` where trying to instantiate a time value with a negative time could throw and unexpected exception and as a result leak a listener.
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.
It's confusing and slightly error prone (see #64116) to handle the timeouts
via overrides but the priority via a field. This simplifies the code to to avoid future
issues and save over 100 LOC.
Also this fixes a bug in
TransportVotingConfigExclusionsActionwhere trying to instantiate a time value with a negative time could throw and unexpected exception and as a result leak a listener.