honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Test] Fix DiscoveryNodesTests.testDeltas() (#28361) 

The DiscoveryNodes.Delta was changed in #28197. Previous/Master nodes
are now always set in the `Delta` (before the change they were set only
if the master changed) and the `masterChanged()` method is now based on
object equality and nodes ephemeral ids (before the change it was based
on nodes id).

This commit adapts the DiscoveryNodesTests.testDeltas() to reflect the
changes.
This commit is contained in:
Tanguy Leroux 2018-01-25 08:52:30 +01:00 committed by GitHub
parent f4d0cf55be
commit 5f0cb3a07e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
server/src/test/java/org/elasticsearch/cluster/node/DiscoveryNodesTests.java
View File

@ -21,6 +21,7 @@ package org.elasticsearch.cluster.node;
import com.carrotsearch.randomizedtesting.generators.RandomPicks; import com.carrotsearch.randomizedtesting.generators.RandomPicks;
import org.elasticsearch.Version; import org.elasticsearch.Version;
import org.elasticsearch.common.transport.TransportAddress;
import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.ESTestCase;
import java.util.ArrayList; import java.util.ArrayList;
@ -113,7 +114,9 @@ public class DiscoveryNodesTests extends ESTestCase {
// change an attribute // change an attribute
Map<String, String> attrs = new HashMap<>(node.getAttributes()); Map<String, String> attrs = new HashMap<>(node.getAttributes());
attrs.put("new", "new"); attrs.put("new", "new");
node = new DiscoveryNode(node.getName(), node.getId(), node.getAddress(), attrs, node.getRoles(), node.getVersion()); final TransportAddress nodeAddress = node.getAddress();
node = new DiscoveryNode(node.getName(), node.getId(), node.getEphemeralId(), nodeAddress.address().getHostString(),
nodeAddress.getAddress(), nodeAddress, attrs, node.getRoles(), node.getVersion());
} }
nodesB.add(node); nodesB.add(node);
} }
@ -140,14 +143,21 @@ public class DiscoveryNodesTests extends ESTestCase {
DiscoveryNodes.Delta delta = discoNodesB.delta(discoNodesA); DiscoveryNodes.Delta delta = discoNodesB.delta(discoNodesA);
if (Objects.equals(masterAId, masterBId)) { if (masterA == null) {
assertFalse(delta.masterNodeChanged());
assertThat(delta.previousMasterNode(), nullValue()); assertThat(delta.previousMasterNode(), nullValue());
} else {
assertThat(delta.previousMasterNode().getId(), equalTo(masterAId));
}
if (masterB == null) {
assertThat(delta.newMasterNode(), nullValue()); assertThat(delta.newMasterNode(), nullValue());
} else {
assertThat(delta.newMasterNode().getId(), equalTo(masterBId));
}
if (Objects.equals(masterAId, masterBId)) {
assertFalse(delta.masterNodeChanged());
} else { } else {
assertTrue(delta.masterNodeChanged()); assertTrue(delta.masterNodeChanged());
assertThat(delta.newMasterNode() != null ? delta.newMasterNode().getId() : null, equalTo(masterBId));
assertThat(delta.previousMasterNode() != null ? delta.previousMasterNode().getId() : null, equalTo(masterAId));
} }
Set<DiscoveryNode> newNodes = new HashSet<>(nodesB); Set<DiscoveryNode> newNodes = new HashSet<>(nodesB);