Skip to content

Fix RestCancellableNodeClientTests.testConcurrentExecuteAndClose() #129294

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.

Sign up for GitHub

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

Merged
merged 5 commits into from
Jun 13, 2025
Merged

Fix RestCancellableNodeClientTests.testConcurrentExecuteAndClose() #129294

Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b14cf47
Fix RestCancellableNodeClientTests.testConcurrentExecuteAndClose()
JeremyDahlgren Jun 11, 2025
15708f4
Merge branch 'main' into fix/129121
JeremyDahlgren Jun 11, 2025
114be1f
Remove if check on isDone(), add comment
JeremyDahlgren Jun 12, 2025
533ec6c
Add comment details per review
JeremyDahlgren Jun 13, 2025
0d663d6
Merge branch 'main' into fix/129121
JeremyDahlgren Jun 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions server/src/test/java/org/elasticsearch/rest/action/RestCancellableNodeClientTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,6 +303,9 @@ public void addCloseListener(ActionListener<Void> listener) {
// if the channel is already closed, the listener gets notified immediately, from the same thread.
if (open.get() == false) {
listener.onResponse(null);
// Ensure closeLatch is pulled by completing the closeListener with a noop that is ignored if it is already completed.
// Note that when the channel is closed we may see multiple addCloseListener() calls, so we do not assert on isDone() here.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

... nor can we rely on the listener with which closeListener is completed itself being completed which is why we pass in a noop() after completing listener directly ourselves. Would you add words to that effect to this comment for the next reader?

This all seems kinda ugly but I don't have a better suggestion.

closeListener.onResponse(ActionListener.assertOnce(ActionListener.noop()));
} else {
assertFalse("close listener already set, only one is allowed!", closeListener.isDone());
closeListener.onResponse(ActionListener.assertOnce(listener));
Expand Down