Fix race condition in RestCancellableNodeClient#126686
Merged
elasticsearchmachine merged 4 commits intoelastic:mainfrom Apr 11, 2025
Merged
Conversation
Today we rely on registering the channel after registering the task to be cancelled to ensure that the task is cancelled even if the channel is closed concurrently. However the client may already have processed a cancellable request on the channel and therefore this mechanism doesn't work. With this change we make sure not to register another task after draining the registrations in order to cancel them. Closes elastic#88201
DaveCTurner
added
>bug
:Distributed/Task Management
elasticsearchmachine
added
the
Team:Distributed Coordination (obsolete)
Collaborator
|
Pinging @elastic/es-distributed-coordination (Team:Distributed Coordination) |
Collaborator
|
Hi @DaveCTurner, I've created a changelog YAML for you. |
original-brownbear
approved these changes
Apr 11, 2025
| private class CloseListener implements ActionListener<Void> { | ||
| private final AtomicReference<HttpChannel> channel = new AtomicReference<>(); | ||
| private final Set<TaskId> tasks = new HashSet<>(); | ||
| private boolean tasksDrained = false; |
Contributor
There was a problem hiding this comment.
NIT: whatever you prefer really but to me it seems that in these spots it's mostly easier to just make tasks non-final and null ist out to signal tasksDrained, removing the need for the copy and somewhat hardening the design against adding a task after tasks have been drained?
It's also one less field which is always nice :)
Contributor
Author
There was a problem hiding this comment.
Yeah fair enough, see 20f492f. Required adding more null checks than I initially expected...
Contributor
There was a problem hiding this comment.
Ah right the stats :) thanks!
DaveCTurner
added
the
auto-merge-without-approval
DaveCTurner
added a commit
to DaveCTurner/elasticsearch
that referenced
this pull request
Apr 11, 2025
Today we rely on registering the channel after registering the task to be cancelled to ensure that the task is cancelled even if the channel is closed concurrently. However the client may already have processed a cancellable request on the channel and therefore this mechanism doesn't work. With this change we make sure not to register another task after draining the registrations in order to cancel them. Closes elastic#88201
DaveCTurner
added a commit
to DaveCTurner/elasticsearch
that referenced
this pull request
Apr 11, 2025
Today we rely on registering the channel after registering the task to be cancelled to ensure that the task is cancelled even if the channel is closed concurrently. However the client may already have processed a cancellable request on the channel and therefore this mechanism doesn't work. With this change we make sure not to register another task after draining the registrations in order to cancel them. Closes elastic#88201
DaveCTurner
added a commit
to DaveCTurner/elasticsearch
that referenced
this pull request
Apr 11, 2025
Today we rely on registering the channel after registering the task to be cancelled to ensure that the task is cancelled even if the channel is closed concurrently. However the client may already have processed a cancellable request on the channel and therefore this mechanism doesn't work. With this change we make sure not to register another task after draining the registrations in order to cancel them. Closes elastic#88201
DaveCTurner
added a commit
to DaveCTurner/elasticsearch
that referenced
this pull request
Apr 11, 2025
Today we rely on registering the channel after registering the task to be cancelled to ensure that the task is cancelled even if the channel is closed concurrently. However the client may already have processed a cancellable request on the channel and therefore this mechanism doesn't work. With this change we make sure not to register another task after draining the registrations in order to cancel them. Closes elastic#88201
Collaborator
💔 Backport failed
You can use sqren/backport to manually backport by running |
DaveCTurner
added a commit
to DaveCTurner/elasticsearch
that referenced
this pull request
Apr 11, 2025
Today we rely on registering the channel after registering the task to be cancelled to ensure that the task is cancelled even if the channel is closed concurrently. However the client may already have processed a cancellable request on the channel and therefore this mechanism doesn't work. With this change we make sure not to register another task after draining the registrations in order to cancel them. Closes elastic#88201 Backport of elastic#126686 to `7.17`
Contributor
Author
|
Backport to 7.17 is #126703 |
elasticsearchmachine
pushed a commit
that referenced
this pull request
Apr 11, 2025
Today we rely on registering the channel after registering the task to be cancelled to ensure that the task is cancelled even if the channel is closed concurrently. However the client may already have processed a cancellable request on the channel and therefore this mechanism doesn't work. With this change we make sure not to register another task after draining the registrations in order to cancel them. Closes #88201
elasticsearchmachine
pushed a commit
that referenced
this pull request
Apr 11, 2025
Today we rely on registering the channel after registering the task to be cancelled to ensure that the task is cancelled even if the channel is closed concurrently. However the client may already have processed a cancellable request on the channel and therefore this mechanism doesn't work. With this change we make sure not to register another task after draining the registrations in order to cancel them. Closes #88201
elasticsearchmachine
pushed a commit
that referenced
this pull request
Apr 11, 2025
Today we rely on registering the channel after registering the task to be cancelled to ensure that the task is cancelled even if the channel is closed concurrently. However the client may already have processed a cancellable request on the channel and therefore this mechanism doesn't work. With this change we make sure not to register another task after draining the registrations in order to cancel them. Closes #88201
elasticsearchmachine
pushed a commit
that referenced
this pull request
Apr 11, 2025
Today we rely on registering the channel after registering the task to be cancelled to ensure that the task is cancelled even if the channel is closed concurrently. However the client may already have processed a cancellable request on the channel and therefore this mechanism doesn't work. With this change we make sure not to register another task after draining the registrations in order to cancel them. Closes #88201
elasticsearchmachine
pushed a commit
that referenced
this pull request
Apr 11, 2025
Today we rely on registering the channel after registering the task to be cancelled to ensure that the task is cancelled even if the channel is closed concurrently. However the client may already have processed a cancellable request on the channel and therefore this mechanism doesn't work. With this change we make sure not to register another task after draining the registrations in order to cancel them. Closes #88201 Backport of #126686 to `7.17`
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Today we rely on registering the channel after registering the task to
be cancelled to ensure that the task is cancelled even if the channel is
closed concurrently. However the client may already have processed a
cancellable request on the channel and therefore this mechanism doesn't
work. With this change we make sure not to register another task after
draining the registrations in order to cancel them.
Closes #88201