Code cleanup (#21177)

Co-authored-by: Matthias Oesterheld <[email protected]>
Graylog2 · Dec 17, 2024 · f197bbb · f197bbb
1 parent 63e03d9
commit f197bbb
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git a/data-node/src/main/java/org/graylog/datanode/configuration/DatanodeConfiguration.java b/data-node/src/main/java/org/graylog/datanode/configuration/DatanodeConfiguration.java
@@ -16,7 +16,6 @@
  */
 package org.graylog.datanode.configuration;
 
-import org.graylog.datanode.OpensearchDistribution;
 import org.graylog2.security.IndexerJwtAuthTokenProvider;
 
 /**
@@ -27,7 +26,6 @@ public record DatanodeConfiguration(
         OpensearchDistributionProvider opensearchDistributionProvider,
         DatanodeDirectories datanodeDirectories,
         int processLogsBufferSize,
-        String opensearchHeap,
         IndexerJwtAuthTokenProvider indexerJwtAuthTokenProvider
 ) {
 }
diff --git a/...-node/src/main/java/org/graylog/datanode/configuration/DatanodeConfigurationProvider.java b/...-node/src/main/java/org/graylog/datanode/configuration/DatanodeConfigurationProvider.java
@@ -40,7 +40,6 @@ public DatanodeConfigurationProvider(
                 opensearchDistributionProvider,
                 DatanodeDirectories.fromConfiguration(localConfiguration, nodeId),
                 localConfiguration.getProcessLogsBufferSize(),
-                localConfiguration.getOpensearchHeap(),
                 jwtTokenProvider
         );
     }

diff --git a/...aylog/datanode/opensearch/configuration/beans/impl/OpensearchCommonConfigurationBean.java b/...aylog/datanode/opensearch/configuration/beans/impl/OpensearchCommonConfigurationBean.java
@@ -43,8 +43,8 @@ public DatanodeConfigurationPart buildConfigurationPart(OpensearchConfigurationP
         return DatanodeConfigurationPart.builder()
                 .properties(commonOpensearchConfig(buildParams))
                 .nodeRoles(localConfiguration.getNodeRoles())
-                .javaOpt("-Xms%s".formatted(datanodeConfiguration.opensearchHeap()))
-                .javaOpt("-Xmx%s".formatted(datanodeConfiguration.opensearchHeap()))
+                .javaOpt("-Xms%s".formatted(localConfiguration.getOpensearchHeap()))
+                .javaOpt("-Xmx%s".formatted(localConfiguration.getOpensearchHeap()))
                 .javaOpt("-Dopensearch.transport.cname_in_publish_address=true")
                 .build();
     }