You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@inlong.apache.org by do...@apache.org on 2022/08/20 11:39:06 UTC
[inlong] branch master updated: [INLONG-5603][DataProxy] The in charges person and other info are not reported (#5606)
This is an automated email from the ASF dual-hosted git repository.
dockerzhang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/inlong.git
The following commit(s) were added to refs/heads/master by this push:
new e07edd2bc [INLONG-5603][DataProxy] The in charges person and other info are not reported (#5606)
e07edd2bc is described below
commit e07edd2bc37da673d17b285a82cabb1e1b70c0d4
Author: Goson Zhang <46...@qq.com>
AuthorDate: Sat Aug 20 19:39:00 2022 +0800
[INLONG-5603][DataProxy] The in charges person and other info are not reported (#5606)
---
inlong-dataproxy/conf/common.properties | 1 +
inlong-dataproxy/dataproxy-docker/Dockerfile | 3 +++
inlong-dataproxy/dataproxy-docker/dataproxy-docker.sh | 2 ++
.../inlong/dataproxy/consts/ConfigConstants.java | 1 +
.../inlong/dataproxy/heartbeat/HeartbeatManager.java | 18 ++++++++++--------
5 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/inlong-dataproxy/conf/common.properties b/inlong-dataproxy/conf/common.properties
index 97d7c7f4b..0848e0490 100644
--- a/inlong-dataproxy/conf/common.properties
+++ b/inlong-dataproxy/conf/common.properties
@@ -27,6 +27,7 @@ proxy.report.port=46801
# proxy cluster name
proxy.cluster.name=default_dataproxy
proxy.cluster.tag=default_cluster
+proxy.cluster.inCharges=admin
# check interval of local config (millisecond)
configCheckInterval=10000
diff --git a/inlong-dataproxy/dataproxy-docker/Dockerfile b/inlong-dataproxy/dataproxy-docker/Dockerfile
index 15d8520da..5b61f1b08 100644
--- a/inlong-dataproxy/dataproxy-docker/Dockerfile
+++ b/inlong-dataproxy/dataproxy-docker/Dockerfile
@@ -29,6 +29,9 @@ ENV MANAGER_OPENAPI_PORT=8083
ENV AUDIT_PROXY_URL=127.0.0.1:10081
# pulsar or tubemq
ENV MQ_TYPE=pulsar
+ENV CLUSTER_TAG=default_cluster
+ENV CLUSTER_NAME=default_dataproxy
+ENV CLUSTER_IN_CHARGES=admin
ENV DATAPROXY_JVM_HEAP_OPTS="-XX:+UseContainerSupport -XX:InitialRAMPercentage=40.0 -XX:MaxRAMPercentage=80.0 -XX:-UseAdaptiveSizePolicy"
WORKDIR /opt/inlong-dataproxy
ADD dataproxy-docker.sh bin/
diff --git a/inlong-dataproxy/dataproxy-docker/dataproxy-docker.sh b/inlong-dataproxy/dataproxy-docker/dataproxy-docker.sh
index 53852c189..c071c3ade 100644
--- a/inlong-dataproxy/dataproxy-docker/dataproxy-docker.sh
+++ b/inlong-dataproxy/dataproxy-docker/dataproxy-docker.sh
@@ -25,6 +25,8 @@ sed -i "s/manager.hosts=.*$/manager.hosts=${MANAGER_OPENAPI_IP}:${MANAGER_OPENAP
sed -i "s/audit.proxys=.*$/audit.proxys=${AUDIT_PROXY_URL}/g" "${common_conf_file}"
sed -i "s/proxy.report.ip=.*$/proxy.report.ip=${local_ip}/g" "${common_conf_file}"
sed -i "s/proxy.cluster.tag=.*$/proxy.cluster.tag=${CLUSTER_TAG}/g" "${common_conf_file}"
+sed -i "s/proxy.cluster.name=.*$/proxy.cluster.name=${$CLUSTER_NAME}/g" "${common_conf_file}"
+sed -i "s/proxy.cluster.inCharges=.*$/proxy.cluster.inCharges=${CLUSTER_IN_CHARGES}/g" "${common_conf_file}"
# start
if [ "${MQ_TYPE}" = "pulsar" ]; then
diff --git a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/consts/ConfigConstants.java b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/consts/ConfigConstants.java
index 266d19986..ae91944d5 100644
--- a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/consts/ConfigConstants.java
+++ b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/consts/ConfigConstants.java
@@ -95,6 +95,7 @@ public class ConfigConstants {
public static final String MANAGER_HOST = "manager.hosts";
public static final String PROXY_CLUSTER_NAME = "proxy.cluster.name";
public static final String PROXY_CLUSTER_TAG = "proxy.cluster.tag";
+ public static final String PROXY_CLUSTER_INCHARGES = "proxy.cluster.inCharges";
public static final String PROXY_REPORT_IP = "proxy.report.ip";
public static final String PROXY_REPORT_PORT = "proxy.report.port";
public static final String CONFIG_CHECK_INTERVAL = "configCheckInterval";
diff --git a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/heartbeat/HeartbeatManager.java b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/heartbeat/HeartbeatManager.java
index 5147182f3..cc98f909c 100644
--- a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/heartbeat/HeartbeatManager.java
+++ b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/heartbeat/HeartbeatManager.java
@@ -53,6 +53,7 @@ public class HeartbeatManager implements AbstractHeartbeatManager {
public static final String DEFAULT_REPORT_PORT = "46801";
public static final String DEFAULT_CLUSTER_TAG = "default_cluster";
public static final String DEFAULT_CLUSTER_NAME = "default_dataproxy";
+ public static final String DEFAULT_CLUSTER_INCHARGES = "admin";
private final CloseableHttpClient httpClient;
private final Gson gson;
@@ -116,16 +117,17 @@ public class HeartbeatManager implements AbstractHeartbeatManager {
ConfigManager configManager = ConfigManager.getInstance();
HeartbeatMsg heartbeatMsg = new HeartbeatMsg();
Map<String, String> commonProperties = configManager.getCommonProperties();
- String reportIp = commonProperties.get(ConfigConstants.PROXY_REPORT_IP);
- String reportPort = commonProperties.getOrDefault(ConfigConstants.PROXY_REPORT_PORT, DEFAULT_REPORT_PORT);
- heartbeatMsg.setIp(reportIp);
- heartbeatMsg.setPort(Integer.parseInt(reportPort));
+ heartbeatMsg.setIp(commonProperties.get(ConfigConstants.PROXY_REPORT_IP));
+ heartbeatMsg.setPort(Integer.parseInt(commonProperties.getOrDefault(
+ ConfigConstants.PROXY_REPORT_PORT, DEFAULT_REPORT_PORT)));
heartbeatMsg.setComponentType(ComponentTypeEnum.DataProxy.getName());
heartbeatMsg.setReportTime(System.currentTimeMillis());
- String clusterTag = commonProperties.getOrDefault(ConfigConstants.PROXY_CLUSTER_TAG, DEFAULT_CLUSTER_TAG);
- String clusterName = commonProperties.getOrDefault(ConfigConstants.PROXY_CLUSTER_NAME, DEFAULT_CLUSTER_NAME);
- heartbeatMsg.setClusterTag(clusterTag);
- heartbeatMsg.setClusterName(clusterName);
+ heartbeatMsg.setClusterTag(commonProperties.getOrDefault(
+ ConfigConstants.PROXY_CLUSTER_TAG, DEFAULT_CLUSTER_TAG));
+ heartbeatMsg.setClusterName(commonProperties.getOrDefault(
+ ConfigConstants.PROXY_CLUSTER_NAME, DEFAULT_CLUSTER_NAME));
+ heartbeatMsg.setInCharges(commonProperties.getOrDefault(
+ ConfigConstants.PROXY_CLUSTER_INCHARGES, DEFAULT_CLUSTER_INCHARGES));
Map<String, String> groupIdMappings = configManager.getGroupIdMappingProperties();
Map<String, Map<String, String>> streamIdMappings = configManager.getStreamIdMappingProperties();