Make NodeConnectionsService#connectToNodes deterministic
#94949
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
Today the `CoordinatorTests` test suite is not totally deterministic because its behaviour depends on the iteration order of the JDK's unordered collections which are not under the control of our test seed. This commit makes `NodeConnectionsService#connectToNodes` iterate through the nodes using `DiscoveryNodes#mastersFirstStream`, which is made deterministic by elastic#94948. It's an ugly hack to do some extra work in production just for the sake of tests, but we're only sorting at most a few hundred elements here so it's not a huge deal. Relates elastic#94946
DaveCTurner
added
>non-issue
:Distributed/Cluster Coordination
|
Pinging @elastic/es-distributed (Team:Distributed) |
arteam
approved these changes
Mar 31, 2023
| @@ -99,7 +100,9 @@ public void connectToNodes(DiscoveryNodes discoveryNodes, Runnable onCompletion) | |||
| final List<Runnable> runnables = new ArrayList<>(discoveryNodes.getSize()); | |||
| try (var refs = new RefCountingRunnable(onCompletion)) { | |||
| synchronized (mutex) { | |||
| for (final DiscoveryNode discoveryNode : discoveryNodes) { | |||
| // Ugly hack: when https://github.com/elastic/elasticsearch/issues/94946 is fixed, just iterate over discoveryNodes here | |||
| for (final Iterator<DiscoveryNode> iterator = discoveryNodes.mastersFirstStream().iterator(); iterator.hasNext();) { | |||
There was a problem hiding this comment.
If we are going to use this pattern in multiple places, what do you think about creating a helper method that yields an iterable object that represents master first sorted discoveryNodes?
public Iterable<DiscoveryNode> mastersFirst() {
return mastersFirstStream()::iterator;
}Then we can continue using for loops as
for (final DiscoveryNode discoveryNode : discoveryNodes.mastersFirst()) {There was a problem hiding this comment.
Thanks, yes, that'd make sense. I think it's just here for now so I'll leave it as it is to avoid adding too much more cruft to the DiscoveryNodes API, but I will do this if I encounter any more of these.
|
@elasticmachine update branch |
DaveCTurner
added
the
auto-merge
|
@elasticmachine please run elasticsearch-ci/part-2 |
rjernst
pushed a commit
to rjernst/elasticsearch
that referenced
this pull request
Apr 6, 2023
…4949) Today the `CoordinatorTests` test suite is not totally deterministic because its behaviour depends on the iteration order of the JDK's unordered collections which are not under the control of our test seed. This commit makes `NodeConnectionsService#connectToNodes` iterate through the nodes using `DiscoveryNodes#mastersFirstStream`, which is made deterministic by elastic#94948. It's an ugly hack to do some extra work in production just for the sake of tests, but we're only sorting at most a few hundred elements here so it's not a huge deal. Relates elastic#94946
saarikabhasi
pushed a commit
to saarikabhasi/elasticsearch
that referenced
this pull request
Apr 10, 2023
…4949) Today the `CoordinatorTests` test suite is not totally deterministic because its behaviour depends on the iteration order of the JDK's unordered collections which are not under the control of our test seed. This commit makes `NodeConnectionsService#connectToNodes` iterate through the nodes using `DiscoveryNodes#mastersFirstStream`, which is made deterministic by elastic#94948. It's an ugly hack to do some extra work in production just for the sake of tests, but we're only sorting at most a few hundred elements here so it's not a huge deal. Relates elastic#94946
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 the
CoordinatorTeststest suite is not totally deterministic because its behaviour depends on the iteration order of the JDK's unordered collections which are not under the control of our test seed.This commit makes
NodeConnectionsService#connectToNodesiterate through the nodes usingDiscoveryNodes#mastersFirstStream, which is made deterministic by #94948. It's an ugly hack to do some extra work in production just for the sake of tests, but we're only sorting at most a few hundred elements here so it's not a huge deal.Relates #94946