DataNode: rename cluster manager property

changelog/unreleased/pr-18342.toml

@@ -0,0 +1,4 @@
+type = "f"
+message = "OpenSearch renamed cluster.initial_master_nodes to initial_cluster_manager_nodes, which was not reflected yet and is a possible cause of startup bugs."
+
+pulls = ["18342"]

data-node/src/main/java/org/graylog/datanode/Configuration.java

@@ -107,8 +107,8 @@ public class Configuration extends BaseConfiguration {
     /**
      * Comma separated list of opensearch nodes that are eligible as manager nodes.
      */
-    @Parameter(value = "cluster_initial_manager_nodes")
-    private String initialManagerNodes;
+    @Parameter(value = "initial_cluster_manager_nodes")
+    private String initialClusterManagerNodes;
 
     @Parameter(value = "opensearch_http_port", converter = IntegerConverter.class)
     private int opensearchHttpPort = 9200;
@@ -340,8 +340,8 @@ public String getDatanodeNodeName() {
         return datanodeNodeName != null && !datanodeNodeName.isBlank() ? datanodeNodeName : getHostname();
     }
 
-    public String getInitialManagerNodes() {
-        return initialManagerNodes;
+    public String getInitialClusterManagerNodes() {
+        return initialClusterManagerNodes;
     }
 
     public int getOpensearchHttpPort() {

data-node/src/main/java/org/graylog/datanode/configuration/OpensearchConfigurationProvider.java

@@ -96,11 +96,11 @@ public OpensearchConfiguration get() {
         try {
             ImmutableMap.Builder<String, String> opensearchProperties = ImmutableMap.builder();
 
-            if (localConfiguration.getInitialManagerNodes() != null && !localConfiguration.getInitialManagerNodes().isBlank()) {
-                opensearchProperties.put("cluster.initial_master_nodes", localConfiguration.getInitialManagerNodes());
+            if (localConfiguration.getInitialClusterManagerNodes() != null && !localConfiguration.getInitialClusterManagerNodes().isBlank()) {
+                opensearchProperties.put("cluster.initial_cluster_manager_nodes", localConfiguration.getInitialClusterManagerNodes());
             } else if (isPreflight()) {
                 final var nodeList = String.join(",", nodeService.allActive().values().stream().map(Node::getHostname).collect(Collectors.toSet()));
-                opensearchProperties.put("cluster.initial_master_nodes", nodeList);
+                opensearchProperties.put("cluster.initial_cluster_manager_nodes", nodeList);
             }
             opensearchProperties.putAll(commonOpensearchConfig(localConfiguration));
 

data-node/src/test/java/org/graylog/datanode/integration/DataNodePluginsIT.java

@@ -24,6 +24,8 @@
 import org.hamcrest.Matchers;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import java.util.concurrent.ExecutionException;
@@ -33,6 +35,7 @@
 
 @ExtendWith(DatanodeTestExtension.class)
 public class DataNodePluginsIT {
+    private static final Logger LOG = LoggerFactory.getLogger(DataNodePluginsIT.class);
     private final DatanodeContainerizedBackend backend;
 
     public DataNodePluginsIT(DatanodeContainerizedBackend backend) {
@@ -43,25 +46,30 @@ public DataNodePluginsIT(DatanodeContainerizedBackend backend) {
     void ensureUnneededPluginsAreNotLoaded() throws Exception {
         final var opensearchRestPort = backend.getOpensearchRestPort();
         final var baseUrl = "http://localhost:" + opensearchRestPort;
-        waitForOpensearch(baseUrl);
+        try {
+            waitForOpensearch(baseUrl);
 
-        given()
-                .get(baseUrl + "/_cat/plugins")
-                .then()
-                .statusCode(200)
-                .body(
-                        Matchers.not(Matchers.containsString("opensearch-alerting")),
-                        Matchers.not(Matchers.containsString("opensearch-custom-codecs")),
-                        Matchers.not(Matchers.containsString("opensearch-geospatial")),
-                        Matchers.not(Matchers.containsString("opensearch-knn")),
-                        Matchers.not(Matchers.containsString("opensearch-neural-search")),
-                        Matchers.not(Matchers.containsString("opensearch-notifications")),
-                        Matchers.not(Matchers.containsString("opensearch-notifications-core")),
-                        Matchers.not(Matchers.containsString("opensearch-performance-analyzer")),
-                        Matchers.not(Matchers.containsString("opensearch-reports-scheduler")),
-                        Matchers.not(Matchers.containsString("opensearch-security-analytics")),
-                        Matchers.not(Matchers.containsString("opensearch-sql"))
-                );
+            given()
+                    .get(baseUrl + "/_cat/plugins")
+                    .then()
+                    .statusCode(200)
+                    .body(
+                            Matchers.not(Matchers.containsString("opensearch-alerting")),
+                            Matchers.not(Matchers.containsString("opensearch-custom-codecs")),
+                            Matchers.not(Matchers.containsString("opensearch-geospatial")),
+                            Matchers.not(Matchers.containsString("opensearch-knn")),
+                            Matchers.not(Matchers.containsString("opensearch-neural-search")),
+                            Matchers.not(Matchers.containsString("opensearch-notifications")),
+                            Matchers.not(Matchers.containsString("opensearch-notifications-core")),
+                            Matchers.not(Matchers.containsString("opensearch-performance-analyzer")),
+                            Matchers.not(Matchers.containsString("opensearch-reports-scheduler")),
+                            Matchers.not(Matchers.containsString("opensearch-security-analytics")),
+                            Matchers.not(Matchers.containsString("opensearch-sql"))
+                    );
+        } catch (Exception exception) {
+            LOG.error("DataNode Container logs follow:\n" + backend.getLogs());
+            throw exception;
+        }
     }
 
     private void waitForOpensearch(String baseUrl) throws ExecutionException, RetryException {

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

@@ -222,7 +222,7 @@ private DatanodeContainerizedBackend createDatanodeContainer(Network network,
                 datanodeContainer -> {
                     datanodeContainer.withNetwork(network);
                     datanodeContainer.withEnv("GRAYLOG_DATANODE_PASSWORD_SECRET", DatanodeContainerizedBackend.SIGNING_SECRET);
-                    datanodeContainer.withEnv("GRAYLOG_DATANODE_CLUSTER_INITIAL_MANAGER_NODES", hostnameNodeA);
+                    datanodeContainer.withEnv("GRAYLOG_DATANODE_INITIAL_CLUSTER_MANAGER_NODES", hostnameNodeA);
                     datanodeContainer.withEnv("GRAYLOG_DATANODE_OPENSEARCH_DISCOVERY_SEED_HOSTS", hostnameNodeA + ":9300");
 
                     datanodeContainer.withFileSystemBind(transportKeystore.location().toAbsolutePath().toString(), IMAGE_WORKING_DIR + "/config/datanode-transport-certificates.p12");

data-node/src/test/java/org/graylog/datanode/testinfra/DatanodeDevContainerBuilder.java

@@ -120,12 +120,12 @@ public org.graylog.testing.datanode.DatanodeDevContainerBuilder network(final Ne
 
     public GenericContainer<?> build() {
         final Path graylog = getPath().resolve("graylog-datanode-" + getProjectVersion() + ".jar");
-        if(!Files.exists(graylog)) {
+        if (!Files.exists(graylog)) {
             LOG.info("Searching for {} failed.", graylog.toAbsolutePath());
             LOG.info("Project repos path: {}, absolute path: {}", getProjectReposPath(), getProjectReposPath().toAbsolutePath());
-            if(Files.exists(getPath())) {
+            if (Files.exists(getPath())) {
                 LOG.info("contents of base path {}:", getPath());
-                try(var files = Files.list(getPath())) {
+                try (var files = Files.list(getPath())) {
                     files.forEach(file -> LOG.info("{}", file.toString()));
                 } catch (IOException ex) {
                     LOG.info("listing files failed with exception: {}", ex.getMessage());
@@ -155,7 +155,7 @@ public GenericContainer<?> build() {
                 .withEnv("GRAYLOG_DATANODE_OPENSEARCH_DISCOVERY_SEED_HOSTS", nodeName + ":" + openSearchTransportPort)
 
                 .withEnv("GRAYLOG_DATANODE_OPENSEARCH_NETWORK_HOST", nodeName)
-                .withEnv("GRAYLOG_DATANODE_CLUSTER_INITIAL_MANAGER_NODES", nodeName)
+                .withEnv("GRAYLOG_DATANODE_INITIAL_CLUSTER_MANAGER_NODES", nodeName)
 
                 .withEnv("GRAYLOG_DATANODE_ROOT_USERNAME", rootUsername)
                 .withEnv("GRAYLOG_DATANODE_PASSWORD_SECRET", passwordSecret)

misc/datanode.conf

@@ -123,7 +123,7 @@ mongodb_uri = mongodb://localhost/graylog
 # if you're not using the automatic data node setup and want to create a cluster, you have to setup the initial manager nodes
 # make sure to remove this setting after the cluster has formed
 #
-# cluster_initial_manager_nodes =
+# initial_cluster_manager_nodes =
 
 #### OpenSearch folders
 #