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

[TEST] create client nodes using node.client: true instead node.data: false and node.master: false 

Create client nodes using `node.client: true` instead of `node.data: false` and `node.master: false`.

We should create client nodes in our test infra using the `node.client:true` settings as that is the one that users use, and the one that we use as well in `ClientNodePredicate` thus we end up not finding client nodes otherwise as they weren't created with the proper setting.

Updated also the `DataNodePredicate` so that `client: true` is enough, no need for `data: false` as well.

Closes #7911
This commit is contained in:
javanna 2014-09-29 14:03:00 +02:00 committed by Luca Cavanna
parent ab9cc336e5
commit 43a1e1c353
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/test/java/org/elasticsearch/test/InternalTestCluster.java
View File

@ -610,7 +610,7 @@ public final class InternalTestCluster extends TestCluster {
public synchronized Client startNodeClient(Settings settings) {
ensureOpen(); // currently unused
Builder builder = settingsBuilder().put(settings).put("node.client", true).put("node.data", false);
Builder builder = settingsBuilder().put(settings).put("node.client", true);
if (size() == 0) {
// if we are the first node - don't wait for a state
builder.put("discovery.initial_state_timeout", 0);
@ -880,7 +880,7 @@ public final class InternalTestCluster extends TestCluster {
NodeAndClient nodeAndClient = nodes.get(buildNodeName);
if (nodeAndClient == null) {
changed = true;
Builder clientSettingsBuilder = ImmutableSettings.builder().put("node.data", false).put("node.master", false);
Builder clientSettingsBuilder = ImmutableSettings.builder().put("node.client", true);
if (enableRandomBenchNodes && usually(random)) {
//client nodes might also be bench nodes
clientSettingsBuilder.put("node.bench", true);
@ -1458,7 +1458,7 @@ public final class InternalTestCluster extends TestCluster {
private static final class DataNodePredicate implements Predicate<NodeAndClient> {
@Override
public boolean apply(NodeAndClient nodeAndClient) {
return nodeAndClient.node.settings().getAsBoolean("node.data", true);
return nodeAndClient.node.settings().getAsBoolean("node.data", true) && nodeAndClient.node.settings().getAsBoolean("node.client", false) == false;
}
}