Use a threadsafe map in SearchAsyncActionTests #34506
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
Today `SearchAsyncActionTests#testFanOutAndCollect` uses a simple `HashMap` for the `nodeToContextMap` variable, which is then accessed from multiple threads without, apparently, explicit synchronisation. This provides an explanation for the test failure identified in elastic#29242 in which `.toString()` returns `"[]"` just before `.isEmpty` returns `false`, without any concurrent modifications. This change converts `nodeToContextMap` to a `newConcurrentMap()` so that this cannot occur. It also fixes a race condition in the detection of double-calling the subsequent search phase. This is a backport of elastic#33700 to 5.6. Relates elastic#33700 Relates elastic#29242
danielmitterdorfer
added
>test
|
Pinging @elastic/es-search-aggs |
|
As this was not a clean cherry-pick to 5.6 I've created a separate PR. I'd appreciate if you could have a look @DaveCTurner as you've created the original PR. |
DaveCTurner
approved these changes
Oct 16, 2018
There was a problem hiding this comment.
LGTM. I think we could not have backported the latchTriggered thing since the corresponding assertion was only introduced to investigate #29242 (and I don't know that it ever fired) but there's no harm in doing so.
|
Ok. Basically I just backported the changes in #33700 verbatim. Thanks for your review; I'll merge as is then. |
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.
Today
SearchAsyncActionTests#testFanOutAndCollectuses a simpleHashMapforthe
nodeToContextMapvariable, which is then accessed from multiple threadswithout, apparently, explicit synchronisation. This provides an explanation for
the test failure identified in #29242 in which
.toString()returns"[]"just before
.isEmptyreturnsfalse, without any concurrent modifications.This change converts
nodeToContextMapto anewConcurrentMap()so that thiscannot occur. It also fixes a race condition in the detection of double-calling
the subsequent search phase.
This is a backport of #33700 to 5.6.
Relates #33700
Relates #29242