opensource/graylog2-server
1
0
Fork 0
mirror of https://github.com/Graylog2/graylog2-server.git synced 2026-03-13 09:32:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

make cluster initial nodes in datanode configurable (#16146)

Browse Source 
* make cluster initial nodes in datanode configurable

* added changelog

* removed forgotten debug logging

* returned opensearch_network_host config for containerized datanode tests
This commit is contained in:
Tomas Dvorak
2023-08-10 14:29:48 +02:00
committed by GitHub
parent 1bf47fb296
commit 18e326b8a1
5 changed files with 33 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
data-node/src/test/java/org/graylog/datanode/integration/DatanodeClusterIT.java
View File

@@ -16,7 +16,9 @@
*/
package org.graylog.datanode.integration;
import com.github.rholder.retry.Attempt;
import com.github.rholder.retry.RetryException;
import com.github.rholder.retry.RetryListener;
import com.github.rholder.retry.Retryer;
import com.github.rholder.retry.RetryerBuilder;
import com.github.rholder.retry.StopStrategies;
@@ -46,13 +48,19 @@ public class DatanodeClusterIT {
@BeforeEach
void setUp() {
primaryNode = new DatanodeContainerizedBackend().start();
primaryNode = new DatanodeContainerizedBackend("nodeA", datanodeContainer -> datanodeContainer
.withEnv("GRAYLOG_DATANODE_CLUSTER_INITIAL_MANAGER_NODES", "nodeA")
.withEnv("GRAYLOG_DATANODE_OPENSEARCH_DISCOVERY_SEED_HOSTS", "nodeA:9300")
).start();
secondaryNode = new DatanodeContainerizedBackend(
primaryNode.getNetwork(),
primaryNode.getMongodbContainer(),
"node2",
new DatanodeDockerHooksAdapter()
"nodeB",
datanodeContainer ->
datanodeContainer
.withEnv("GRAYLOG_DATANODE_CLUSTER_INITIAL_MANAGER_NODES", "nodeA")
.withEnv("GRAYLOG_DATANODE_OPENSEARCH_DISCOVERY_SEED_HOSTS", "nodeA:9300")
);
secondaryNode.start();
}

7
data-node/src/test/java/org/graylog/datanode/testinfra/DatanodeContainerizedBackend.java
View File

@@ -44,12 +44,15 @@ public class DatanodeContainerizedBackend {
this(new DatanodeDockerHooksAdapter());
}
public DatanodeContainerizedBackend(DatanodeDockerHooks hooks) {
this("node1", hooks);
}
public DatanodeContainerizedBackend(final String nodeName, DatanodeDockerHooks hooks) {
this.network = Network.newNetwork();
this.mongodbContainer = createMongodbContainer();
this.datanodeContainer = createDatanodeContainer(
"node1",
nodeName,
hooks, createDockerImageFile(getOpensearchVersion()),
getDatanodeVersion());
}