This is an automated email from the ASF dual-hosted git repository.
wuzhiguo pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/bigtop-manager.git
The following commit(s) were added to refs/heads/main by this push:
new 38454308 BIGTOP-4496: Excessive warning logs during component
installation (#265)
38454308 is described below
commit 38454308f93bf7e2da4ae5d81ad659e66678e989
Author: Dansanyo <[email protected]>
AuthorDate: Thu Sep 11 21:36:44 2025 +0800
BIGTOP-4496: Excessive warning logs during component installation (#265)
---
.../3.3.0/services/kafka/configuration/kafka-broker.xml | 6 +++---
.../bigtop/3.3.0/services/solr/configuration/solr.in.xml | 9 ++++-----
.../3.3.0/services/kafka/configuration/kafka-broker.xml | 6 +++---
.../manager/stack/bigtop/v3_3_0/kafka/KafkaParams.java | 12 ++++++++++++
.../manager/stack/bigtop/v3_3_0/kafka/KafkaSetup.java | 10 +---------
.../manager/stack/bigtop/v3_3_0/solr/SolrParams.java | 14 ++++++++++----
6 files changed, 33 insertions(+), 24 deletions(-)
diff --git
a/bigtop-manager-server/src/main/resources/stacks/bigtop/3.3.0/services/kafka/configuration/kafka-broker.xml
b/bigtop-manager-server/src/main/resources/stacks/bigtop/3.3.0/services/kafka/configuration/kafka-broker.xml
index 2e915dc9..1e6fea73 100644
---
a/bigtop-manager-server/src/main/resources/stacks/bigtop/3.3.0/services/kafka/configuration/kafka-broker.xml
+++
b/bigtop-manager-server/src/main/resources/stacks/bigtop/3.3.0/services/kafka/configuration/kafka-broker.xml
@@ -31,7 +31,7 @@
</property>
<property>
<name>zookeeper.connect</name>
- <value><![CDATA[<#if zk_server_list?? ><#list zk_server_list as
host>${host}:2181<#sep>,</#sep></#list><#else>localhost:2181</#if>]]></value>
+ <value>localhost:2181</value>
<description>
Zookeeper also allows you to add a "chroot" path which will make
all kafka data for this cluster appear
under a particular path.
@@ -43,14 +43,14 @@
</property>
<property>
<name>listeners</name>
- <value><![CDATA[PLAINTEXT://<#if host??
>${host}:9092<#else>localhost:9092</#if>]]></value>
+ <value>PLAINTEXT://${host}:9092</value>
<description>
host and port where kafka broker will be accepting connections.
localhost will be substituted with hostname.
</description>
</property>
<property>
<name>advertised.listeners</name>
- <value><![CDATA[PLAINTEXT://<#if host??
>${host}:9092<#else>localhost:9092</#if>]]></value>
+ <value>PLAINTEXT://${host}:9092</value>
<description>
Listeners to publish to ZooKeeper for clients to use, if different
than the listeners config property.
</description>
diff --git
a/bigtop-manager-server/src/main/resources/stacks/bigtop/3.3.0/services/solr/configuration/solr.in.xml
b/bigtop-manager-server/src/main/resources/stacks/bigtop/3.3.0/services/solr/configuration/solr.in.xml
index 405ac514..5784c0cc 100644
---
a/bigtop-manager-server/src/main/resources/stacks/bigtop/3.3.0/services/solr/configuration/solr.in.xml
+++
b/bigtop-manager-server/src/main/resources/stacks/bigtop/3.3.0/services/solr/configuration/solr.in.xml
@@ -140,8 +140,7 @@
<property>
<name>solr_zookeeper_quorum</name>
- <value>
- <![CDATA[<#if zookeeper_quorum?? ><#list zookeeper_quorum as
host>${host}:2181<#sep>,</#sep></#list><#else>localhost:2181</#if>]]></value>
+ <value>localhost:2181</value>
<description>Placeholder for Solr Zookeeper connection string. (Use
the cluster one by default, you can override
this with a custom one if ZK needs to be external)
</description>
@@ -187,7 +186,7 @@
<property>
<name>solr_extra_java_opts</name>
- <value />
+ <value/>
<description>Extra Solr java options (e.g.: -Dproperty=value), that
will be added to SOLR_OPTS environment
variable
</description>
@@ -195,11 +194,11 @@
<property>
<name>solr_gc_log_opts</name>
- <value />
+ <value/>
</property>
<property>
<name>solr_gc_tune</name>
- <value />
+ <value/>
</property>
<property>
<name>solr_min_mem</name>
diff --git
a/bigtop-manager-server/src/test/resources/stacks/bigtop/3.3.0/services/kafka/configuration/kafka-broker.xml
b/bigtop-manager-server/src/test/resources/stacks/bigtop/3.3.0/services/kafka/configuration/kafka-broker.xml
index 2e915dc9..1e6fea73 100644
---
a/bigtop-manager-server/src/test/resources/stacks/bigtop/3.3.0/services/kafka/configuration/kafka-broker.xml
+++
b/bigtop-manager-server/src/test/resources/stacks/bigtop/3.3.0/services/kafka/configuration/kafka-broker.xml
@@ -31,7 +31,7 @@
</property>
<property>
<name>zookeeper.connect</name>
- <value><![CDATA[<#if zk_server_list?? ><#list zk_server_list as
host>${host}:2181<#sep>,</#sep></#list><#else>localhost:2181</#if>]]></value>
+ <value>localhost:2181</value>
<description>
Zookeeper also allows you to add a "chroot" path which will make
all kafka data for this cluster appear
under a particular path.
@@ -43,14 +43,14 @@
</property>
<property>
<name>listeners</name>
- <value><![CDATA[PLAINTEXT://<#if host??
>${host}:9092<#else>localhost:9092</#if>]]></value>
+ <value>PLAINTEXT://${host}:9092</value>
<description>
host and port where kafka broker will be accepting connections.
localhost will be substituted with hostname.
</description>
</property>
<property>
<name>advertised.listeners</name>
- <value><![CDATA[PLAINTEXT://<#if host??
>${host}:9092<#else>localhost:9092</#if>]]></value>
+ <value>PLAINTEXT://${host}:9092</value>
<description>
Listeners to publish to ZooKeeper for clients to use, if different
than the listeners config property.
</description>
diff --git
a/bigtop-manager-stack/bigtop-manager-stack-bigtop/src/main/java/org/apache/bigtop/manager/stack/bigtop/v3_3_0/kafka/KafkaParams.java
b/bigtop-manager-stack/bigtop-manager-stack-bigtop/src/main/java/org/apache/bigtop/manager/stack/bigtop/v3_3_0/kafka/KafkaParams.java
index 42f1a8e6..d1027b12 100644
---
a/bigtop-manager-stack/bigtop-manager-stack-bigtop/src/main/java/org/apache/bigtop/manager/stack/bigtop/v3_3_0/kafka/KafkaParams.java
+++
b/bigtop-manager-stack/bigtop-manager-stack-bigtop/src/main/java/org/apache/bigtop/manager/stack/bigtop/v3_3_0/kafka/KafkaParams.java
@@ -24,11 +24,15 @@ import
org.apache.bigtop.manager.stack.core.annotations.GlobalParams;
import org.apache.bigtop.manager.stack.core.spi.param.Params;
import org.apache.bigtop.manager.stack.core.utils.LocalSettings;
+import org.springframework.util.CollectionUtils;
+
import com.google.auto.service.AutoService;
import lombok.Getter;
import lombok.NoArgsConstructor;
+import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
@Getter
@AutoService(Params.class)
@@ -49,12 +53,20 @@ public class KafkaParams extends BigtopParams {
globalParamsMap.put("java_home", javaHome());
globalParamsMap.put("kafka_conf_dir", confDir());
globalParamsMap.put("security_enabled", false);
+ globalParamsMap.put("host", hostname());
}
@GlobalParams
public Map<String, Object> kafkaBroker() {
Map<String, Object> kafkaBroker =
LocalSettings.configurations(getServiceName(), "kafka-broker");
kafkaDataDir = (String) kafkaBroker.get("log.dirs");
+
+ List<String> zookeeperServerHosts =
LocalSettings.componentHosts("zookeeper_server");
+ if (!CollectionUtils.isEmpty(zookeeperServerHosts)) {
+ String zkServerListStr =
+ zookeeperServerHosts.stream().map(s -> s +
":2181").collect(Collectors.joining(","));
+ kafkaBroker.put("zookeeper.connect", zkServerListStr);
+ }
return kafkaBroker;
}
diff --git
a/bigtop-manager-stack/bigtop-manager-stack-bigtop/src/main/java/org/apache/bigtop/manager/stack/bigtop/v3_3_0/kafka/KafkaSetup.java
b/bigtop-manager-stack/bigtop-manager-stack-bigtop/src/main/java/org/apache/bigtop/manager/stack/bigtop/v3_3_0/kafka/KafkaSetup.java
index e7e13b39..adddb041 100644
---
a/bigtop-manager-stack/bigtop-manager-stack-bigtop/src/main/java/org/apache/bigtop/manager/stack/bigtop/v3_3_0/kafka/KafkaSetup.java
+++
b/bigtop-manager-stack/bigtop-manager-stack-bigtop/src/main/java/org/apache/bigtop/manager/stack/bigtop/v3_3_0/kafka/KafkaSetup.java
@@ -21,7 +21,6 @@ package org.apache.bigtop.manager.stack.bigtop.v3_3_0.kafka;
import org.apache.bigtop.manager.common.shell.ShellResult;
import org.apache.bigtop.manager.stack.core.enums.ConfigType;
import org.apache.bigtop.manager.stack.core.spi.param.Params;
-import org.apache.bigtop.manager.stack.core.utils.LocalSettings;
import org.apache.bigtop.manager.stack.core.utils.linux.LinuxFileUtils;
import lombok.AccessLevel;
@@ -29,9 +28,6 @@ import lombok.NoArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import java.text.MessageFormat;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
import static
org.apache.bigtop.manager.common.constants.Constants.PERMISSION_644;
import static
org.apache.bigtop.manager.common.constants.Constants.PERMISSION_755;
@@ -53,10 +49,6 @@ public class KafkaSetup {
LinuxFileUtils.createDirectories(kafkaParams.getKafkaLogDir(),
kafkaUser, kafkaGroup, PERMISSION_755, true);
LinuxFileUtils.createDirectories(kafkaParams.getKafkaPidDir(),
kafkaUser, kafkaGroup, PERMISSION_755, true);
- List<String> zookeeperServerHosts =
LocalSettings.componentHosts("zookeeper_server");
- Map<String, Object> paramMap = new HashMap<>();
- paramMap.put("zk_server_list", zookeeperServerHosts);
- paramMap.put("host", kafkaParams.hostname());
LinuxFileUtils.toFile(
ConfigType.PROPERTIES,
MessageFormat.format("{0}/server.properties", confDir),
@@ -64,7 +56,7 @@ public class KafkaSetup {
kafkaGroup,
PERMISSION_644,
kafkaParams.kafkaBroker(),
- paramMap);
+ kafkaParams.getGlobalParamsMap());
LinuxFileUtils.toFileByTemplate(
kafkaParams.getKafkaEnvContent(),
diff --git
a/bigtop-manager-stack/bigtop-manager-stack-bigtop/src/main/java/org/apache/bigtop/manager/stack/bigtop/v3_3_0/solr/SolrParams.java
b/bigtop-manager-stack/bigtop-manager-stack-bigtop/src/main/java/org/apache/bigtop/manager/stack/bigtop/v3_3_0/solr/SolrParams.java
index e4408d24..b43252c8 100644
---
a/bigtop-manager-stack/bigtop-manager-stack-bigtop/src/main/java/org/apache/bigtop/manager/stack/bigtop/v3_3_0/solr/SolrParams.java
+++
b/bigtop-manager-stack/bigtop-manager-stack-bigtop/src/main/java/org/apache/bigtop/manager/stack/bigtop/v3_3_0/solr/SolrParams.java
@@ -32,6 +32,7 @@ import lombok.extern.slf4j.Slf4j;
import java.text.MessageFormat;
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
@Getter
@Slf4j
@@ -71,12 +72,17 @@ public class SolrParams extends BigtopParams {
solrPort = (String) solrEnv.get("solr_port");
solrPidFile = solrPidDir + "/solr-" + solrPort + ".pid";
- List<String> ZookeeperServerHosts =
LocalSettings.componentHosts("zookeeper_server");
- Map<String, Object> ZKPort = LocalSettings.configurations("zookeeper",
"zoo.cfg");
- String clientPort = (String) ZKPort.get("clientPort");
+ List<String> zookeeperServerHosts =
LocalSettings.componentHosts("zookeeper_server");
+ Map<String, Object> zKPort = LocalSettings.configurations("zookeeper",
"zoo.cfg");
+ String clientPort = (String) zKPort.get("clientPort");
zNode = (String) solrEnv.get("solr_znode");
- zkString = MessageFormat.format("{0}:{1}",
ZookeeperServerHosts.get(0), clientPort);
+ zkString = MessageFormat.format("{0}:{1}",
zookeeperServerHosts.get(0), clientPort);
zkHost = MessageFormat.format("{0}{1}", zkString, zNode);
+
+ String zkServerListStr =
+ zookeeperServerHosts.stream().map(s -> s +
":2181").collect(Collectors.joining(","));
+ solrEnv.put("solr_zookeeper_quorum", zkServerListStr);
+
return solrEnv;
}
