honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-02-28 07:59:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Node clients in tests use now the same naming convention as ordinary nodes (node#)

Browse Source
This commit is contained in:
Luca Cavanna 2013-09-04 10:12:54 +02:00
parent d5323231fe
commit 74b00b63ea
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/test/java/org/elasticsearch/test/integration/TestCluster.java
View File

@ -167,7 +167,7 @@ public class TestCluster {
public Node buildNode(Settings settings) { public Node buildNode(Settings settings) {
ensureOpen(); ensureOpen();
String name = "node_" + nextNodeId.getAndIncrement(); String name = buildNodeName();
String settingsSource = getClass().getName().replace('.', '/') + ".yml"; String settingsSource = getClass().getName().replace('.', '/') + ".yml";
Settings finalSettings = settingsBuilder() Settings finalSettings = settingsBuilder()
.loadFromClasspath(settingsSource) .loadFromClasspath(settingsSource)
@ -180,6 +180,10 @@ public class TestCluster {
return node; return node;
} }
private String buildNodeName() {
return "node_" + nextNodeId.getAndIncrement();
}
public void setClientFactory(ClientFactory factory) { public void setClientFactory(ClientFactory factory) {
this.clientFactory = factory; this.clientFactory = factory;
} }
@ -374,7 +378,7 @@ public class TestCluster {
public Client nodeClient() { public Client nodeClient() {
ensureOpen(); ensureOpen();
if (clientNode == null) { if (clientNode == null) {
String name = UUID.randomUUID().toString(); String name = buildNodeName();
String settingsSource = getClass().getName().replace('.', '/') + ".yml"; String settingsSource = getClass().getName().replace('.', '/') + ".yml";
Settings finalSettings = settingsBuilder().loadFromClasspath(settingsSource).put(defaultSettings).put("node.client", true).put("name", name) Settings finalSettings = settingsBuilder().loadFromClasspath(settingsSource).put(defaultSettings).put("node.client", true).put("name", name)
.build(); .build();