Fix open/close race in ConnectionManagerTests #50621
Merged
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
Currently we reuse the same test connection for all connection attempts in the testConcurrentConnectsAndDisconnects test. This means that if the connection fails due to a pre-existing connection, the connection will be closed impacting the state of all conenction attempts. This commit fixes the test, by returning a unique connection for each attempt.
Tim-Brooks
added
>test
|
Pinging @elastic/es-distributed (:Distributed/Network) |
DaveCTurner
requested changes
Jan 3, 2020
server/src/test/java/org/elasticsearch/transport/ConnectionManagerTests.java
Outdated
Show resolved
Hide resolved
| doAnswer(invocationOnMock -> { | ||
| Transport.Connection connection = new TestConnect(node); |
There was a problem hiding this comment.
Could we keep track of all of these connections and assert that all but one of them has been closed when the dust has settled?
server/src/test/java/org/elasticsearch/transport/ConnectionManagerTests.java
Outdated
Show resolved
Hide resolved
DaveCTurner
reviewed
Jan 7, 2020
|
|
||
| // Only a single connection attempt should be open. | ||
| long size = connections.stream().filter(c -> !c.isClosed()).count(); | ||
| assertEquals(1, size); |
There was a problem hiding this comment.
Sorry, I misled you, this can be zero if all 10 connection attempts fail.
| @@ -198,6 +207,16 @@ public void testConcurrentConnectsAndDisconnects() throws BrokenBarrierException | |||
| }); | |||
|
|
|||
| assertEquals(10, nodeConnectedCount.get() + nodeFailureCount.get()); | |||
|
|
|||
| // Only a single connection attempt should be open. | |||
| long size = connections.stream().filter(c -> !c.isClosed()).count(); | |||
DaveCTurner
approved these changes
Jan 8, 2020
Tim-Brooks
added a commit
that referenced
this pull request
Jan 14, 2020
Currently we reuse the same test connection for all connection attempts in the testConcurrentConnectsAndDisconnects test. This means that if the connection fails due to a pre-existing connection, the connection will be closed impacting the state of all connection attempts. This commit fixes the test, by returning a unique connection for each attempt. Fixes #49903.
SivagurunathanV
pushed a commit
to SivagurunathanV/elasticsearch
that referenced
this pull request
Jan 23, 2020
Currently we reuse the same test connection for all connection attempts in the testConcurrentConnectsAndDisconnects test. This means that if the connection fails due to a pre-existing connection, the connection will be closed impacting the state of all connection attempts. This commit fixes the test, by returning a unique connection for each attempt. Fixes elastic#49903.
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.
Currently we reuse the same test connection for all connection attempts
in the testConcurrentConnectsAndDisconnects test. This means that if the
connection fails due to a pre-existing connection, the connection will
be closed impacting the state of all connection attempts. This commit
fixes the test, by returning a unique connection for each attempt.
Fixes #49903.