This is an automated email from the ASF dual-hosted git repository.
gosonzhang 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 5a0ae62b94 [INLONG-10067][DataProxy] Simplify the configuration and
acquisition of the Manager address (#10068)
5a0ae62b94 is described below
commit 5a0ae62b943d9b254db83bdbf48bf022b2ca3054
Author: Goson Zhang <[email protected]>
AuthorDate: Thu Apr 25 12:45:30 2024 +0800
[INLONG-10067][DataProxy] Simplify the configuration and acquisition of the
Manager address (#10068)
---
.../dataproxy/config/CommonConfigHolder.java | 198 ++++++++++++---------
.../inlong/dataproxy/config/ConfigHolder.java | 4 +-
.../inlong/dataproxy/config/ConfigManager.java | 39 +---
.../config/DefaultManagerIpListParser.java | 65 -------
.../dataproxy/config/IManagerIpListParser.java | 35 ----
.../src/test/resources/common.properties | 2 +-
6 files changed, 123 insertions(+), 220 deletions(-)
diff --git
a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/config/CommonConfigHolder.java
b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/config/CommonConfigHolder.java
index 0bfbd84ddc..92d0bba627 100644
---
a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/config/CommonConfigHolder.java
+++
b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/config/CommonConfigHolder.java
@@ -44,45 +44,56 @@ import java.util.Properties;
*/
public class CommonConfigHolder {
- public static final Logger LOG =
LoggerFactory.getLogger(CommonConfigHolder.class);
+ private static final Logger LOG =
LoggerFactory.getLogger(CommonConfigHolder.class);
// configure file name
- public static final String COMMON_CONFIG_FILE_NAME = "common.properties";
+ private static final String COMMON_CONFIG_FILE_NAME = "common.properties";
+ // list split separator
+ private static final String VAL_CONFIG_ITEMS_SEPARATOR = ",|\\s+";
// **** allowed keys and default value, begin
// cluster tag
- public static final String KEY_PROXY_CLUSTER_TAG = "proxy.cluster.tag";
- public static final String VAL_DEF_CLUSTER_TAG = "default_cluster";
+ private static final String KEY_PROXY_CLUSTER_TAG = "proxy.cluster.tag";
+ private static final String VAL_DEF_CLUSTER_TAG = "default_cluster";
// cluster name
- public static final String KEY_PROXY_CLUSTER_NAME = "proxy.cluster.name";
- public static final String VAL_DEF_CLUSTER_NAME = "default_dataproxy";
+ private static final String KEY_PROXY_CLUSTER_NAME = "proxy.cluster.name";
+ private static final String VAL_DEF_CLUSTER_NAME = "default_dataproxy";
// cluster incharges
- public static final String KEY_PROXY_CLUSTER_INCHARGES =
"proxy.cluster.inCharges";
- public static final String VAL_DEF_CLUSTER_INCHARGES = "admin";
+ @Deprecated
+ private static final String KEY_PROXY_CLUSTER_INCHARGES =
"proxy.cluster.inCharges";
+ private static final String KEY_PROXY_CLUSTER_INCHARGESV2 =
"proxy.cluster.incharges";
+ private static final String VAL_DEF_CLUSTER_INCHARGES = "admin";
// cluster exttag,
- public static final String KEY_PROXY_CLUSTER_EXT_TAG =
"proxy.cluster.extTag";
+ @Deprecated
+ private static final String KEY_PROXY_CLUSTER_EXT_TAG =
"proxy.cluster.extTag";
+ private static final String KEY_PROXY_CLUSTER_EXT_TAGV2 =
"proxy.cluster.ext.tag";
// predefined format of ext tag: {key}={value}
- public static final String VAL_DEF_CLUSTER_EXT_TAG = "default=true";
- // manager type
- public static final String KEY_MANAGER_TYPE = "manager.type";
- public static final String VAL_DEF_MANAGER_TYPE =
DefaultManagerIpListParser.class.getName();
+ private static final String VAL_DEF_CLUSTER_EXT_TAG = "default=true";
// manager hosts
- public static final String KEY_MANAGER_HOSTS = "manager.hosts";
- public static final String KEY_MANAGER_HOSTS_SEPARATOR = ",";
+ private static final String KEY_MANAGER_HOSTS = "manager.hosts";
+ private static final String KEY_MANAGER_HOST_PORT_SEPARATOR = ":";
// manager auth secret id
- public static final String KEY_MANAGER_AUTH_SECRET_ID =
"manager.auth.secretId";
+ @Deprecated
+ private static final String KEY_MANAGER_AUTH_SECRET_ID =
"manager.auth.secretId";
+ private static final String KEY_MANAGER_AUTH_SECRET_IDV2 =
"manager.auth.secret.id";
// manager auth secret key
- public static final String KEY_MANAGER_AUTH_SECRET_KEY =
"manager.auth.secretKey";
+ @Deprecated
+ private static final String KEY_MANAGER_AUTH_SECRET_KEY =
"manager.auth.secretKey";
+ private static final String KEY_MANAGER_AUTH_SECRET_KEYV2 =
"manager.auth.secret.key";
// configure file check interval
- private static final String KEY_META_CONFIG_SYNC_INTERVAL_MS =
"meta.config.sync.interval.ms";
+ @Deprecated
private static final String KEY_CONFIG_CHECK_INTERVAL_MS =
"configCheckInterval";
- public static final long VAL_DEF_CONFIG_SYNC_INTERVAL_MS = 60000L;
- public static final long VAL_MIN_CONFIG_SYNC_INTERVAL_MS = 10000L;
+ private static final String KEY_META_CONFIG_SYNC_INTERVAL_MS =
"meta.config.sync.interval.ms";
+ private static final long VAL_DEF_CONFIG_SYNC_INTERVAL_MS = 60000L;
+ private static final long VAL_MIN_CONFIG_SYNC_INTERVAL_MS = 10000L;
// max allowed wait duration
private static final String KEY_META_CONFIG_SYNC_WAST_ALARM_MS =
"meta.config.sync.wast.alarm.ms";
- public static final long VAL_DEF_META_CONFIG_SYNC_WAST_ALARM_MS = 30000L;
+ private static final long VAL_DEF_META_CONFIG_SYNC_WAST_ALARM_MS = 40000L;
// whether to startup using the local metadata.json file without
connecting to the Manager
+ @Deprecated
private static final String KEY_ENABLE_STARTUP_USING_LOCAL_META_FILE =
"startup.using.local.meta.file.enable";
- public static final boolean VAL_DEF_ENABLE_STARTUP_USING_LOCAL_META_FILE =
false;
+ private static final String KEY_ENABLE_STARTUP_USING_LOCAL_META_FILEV2 =
+ "meta.config.startup.using.local.file.enable";
+ private static final boolean VAL_DEF_ENABLE_STARTUP_USING_LOCAL_META_FILE
= false;
// whether to accept messages without mapping between groupId/streamId and
topic
public static final String KEY_ENABLE_UNCONFIGURED_TOPIC_ACCEPT =
"id2topic.unconfigured.accept.enable";
public static final boolean VAL_DEF_ENABLE_UNCONFIGURED_TOPIC_ACCEPT =
false;
@@ -158,12 +169,13 @@ public class CommonConfigHolder {
private static volatile boolean isInit = false;
private Map<String, String> props;
// pre-read field values
+ // node setting
private String clusterTag = VAL_DEF_CLUSTER_TAG;
private String clusterName = VAL_DEF_CLUSTER_NAME;
private String clusterIncharges = VAL_DEF_CLUSTER_INCHARGES;
private String clusterExtTag = VAL_DEF_CLUSTER_EXT_TAG;
- private String managerType = VAL_DEF_MANAGER_TYPE;
- private IManagerIpListParser ipListParser = null;
+ // manager setting
+ private final List<String> managerIpList = new ArrayList<>();
private String managerAuthSecretId = "";
private String managerAuthSecretKey = "";
private boolean enableStartupUsingLocalMetaFile =
VAL_DEF_ENABLE_STARTUP_USING_LOCAL_META_FILE;
@@ -281,12 +293,8 @@ public class CommonConfigHolder {
return this.enableWhiteList;
}
- public String getManagerType() {
- return managerType;
- }
-
public List<String> getManagerHosts() {
- return this.ipListParser.getIpList();
+ return this.managerIpList;
}
public String getManagerAuthSecretId() {
@@ -406,27 +414,8 @@ public class CommonConfigHolder {
if (StringUtils.isNotEmpty(tmpValue)) {
this.clusterExtTag = tmpValue.trim();
}
- // read configure sync interval
- tmpValue = this.props.get(KEY_META_CONFIG_SYNC_INTERVAL_MS);
- if (StringUtils.isBlank(tmpValue)) {
- tmpValue = this.props.get(KEY_CONFIG_CHECK_INTERVAL_MS);
- }
- if (StringUtils.isNotEmpty(tmpValue)) {
- long tmpSyncInvMs = NumberUtils.toLong(tmpValue.trim(),
VAL_DEF_CONFIG_SYNC_INTERVAL_MS);
- if (tmpSyncInvMs >= VAL_MIN_CONFIG_SYNC_INTERVAL_MS) {
- this.metaConfigSyncInvlMs = tmpSyncInvMs;
- }
- }
- // read configure sync wast alarm ms
- tmpValue = this.props.get(KEY_META_CONFIG_SYNC_WAST_ALARM_MS);
- if (StringUtils.isNotBlank(tmpValue)) {
- this.metaConfigWastAlarmMs = NumberUtils.toLong(tmpValue.trim(),
VAL_DEF_META_CONFIG_SYNC_WAST_ALARM_MS);
- }
- // read enable startup using local meta file
- tmpValue = this.props.get(KEY_ENABLE_STARTUP_USING_LOCAL_META_FILE);
- if (StringUtils.isNotEmpty(tmpValue)) {
- this.enableStartupUsingLocalMetaFile =
"TRUE".equalsIgnoreCase(tmpValue.trim());
- }
+ // read the manager setting
+ this.preReadManagerSetting();
// read whether accept msg without id2topic configure
tmpValue = this.props.get(KEY_ENABLE_UNCONFIGURED_TOPIC_ACCEPT);
if (StringUtils.isNotEmpty(tmpValue)) {
@@ -452,21 +441,6 @@ public class CommonConfigHolder {
if (StringUtils.isNotEmpty(tmpValue)) {
this.enableWhiteList = "TRUE".equalsIgnoreCase(tmpValue.trim());
}
- // read manager type
- tmpValue = this.props.get(KEY_MANAGER_TYPE);
- if (StringUtils.isNotBlank(tmpValue)) {
- this.managerType = tmpValue.trim();
- }
- // read manager auth secret id
- tmpValue = this.props.get(KEY_MANAGER_AUTH_SECRET_ID);
- if (StringUtils.isNotBlank(tmpValue)) {
- this.managerAuthSecretId = tmpValue.trim();
- }
- // read manager auth secret key
- tmpValue = this.props.get(KEY_MANAGER_AUTH_SECRET_KEY);
- if (StringUtils.isNotBlank(tmpValue)) {
- this.managerAuthSecretKey = tmpValue.trim();
- }
// read whether enable file metric
tmpValue = this.props.get(KEY_ENABLE_FILE_METRIC);
if (StringUtils.isNotEmpty(tmpValue)) {
@@ -587,29 +561,68 @@ public class CommonConfigHolder {
this.maxRetriesAfterFailure = retries;
}
}
- // initial ip parser
- try {
- Class<? extends IManagerIpListParser> ipListParserClass =
- (Class<? extends IManagerIpListParser>)
Class.forName(this.managerType);
- this.ipListParser =
ipListParserClass.getDeclaredConstructor().newInstance();
- this.ipListParser.setCommonProperties(this.props);
- } catch (Throwable t) {
- LOG.error("Initial ipListParser Class {} failure, exit!",
this.managerType, t);
- System.exit(6);
- }
}
- private void chkRequiredFields(String requiredFieldKey) {
- String fieldVal = props.get(requiredFieldKey);
- if (fieldVal == null) {
- LOG.error("Missing mandatory field {} in {}, exit!",
- requiredFieldKey, COMMON_CONFIG_FILE_NAME);
- System.exit(4);
+ private void preReadManagerSetting() {
+ String tmpValue;
+ // read manager hosts
+ String managerHosts = this.props.get(KEY_MANAGER_HOSTS);
+ if (StringUtils.isBlank(managerHosts)) {
+ LOG.error("Value of {} is required in {}, exit!",
KEY_MANAGER_HOSTS, COMMON_CONFIG_FILE_NAME);
+ System.exit(2);
}
- if (StringUtils.isBlank(fieldVal)) {
- LOG.error("Required {} field value is blank in {}, exit!",
- requiredFieldKey, COMMON_CONFIG_FILE_NAME);
- System.exit(5);
+ managerHosts = managerHosts.trim();
+ String[] hostPort;
+ String[] hostPortList = managerHosts.split(VAL_CONFIG_ITEMS_SEPARATOR);
+ for (String tmpItem : hostPortList) {
+ if (StringUtils.isBlank(tmpItem)) {
+ continue;
+ }
+ hostPort = tmpItem.split(KEY_MANAGER_HOST_PORT_SEPARATOR);
+ if (hostPort.length != 2
+ || StringUtils.isBlank(hostPort[0])
+ || StringUtils.isBlank(hostPort[1])) {
+ continue;
+ }
+ managerIpList.add(hostPort[0].trim() +
KEY_MANAGER_HOST_PORT_SEPARATOR + hostPort[1].trim());
+ }
+ if (managerIpList.isEmpty()) {
+ LOG.error("Invalid value {} in configure item {}, exit!",
managerHosts, KEY_MANAGER_HOSTS);
+ System.exit(2);
+ }
+ // read manager auth secret id
+ tmpValue = compatGetValue(this.props,
+ KEY_MANAGER_AUTH_SECRET_IDV2, KEY_MANAGER_AUTH_SECRET_ID);
+ if (StringUtils.isNotBlank(tmpValue)) {
+ this.managerAuthSecretId = tmpValue.trim();
+ }
+ // read manager auth secret key
+ tmpValue = compatGetValue(this.props,
+ KEY_MANAGER_AUTH_SECRET_KEYV2, KEY_MANAGER_AUTH_SECRET_KEY);
+ if (StringUtils.isNotBlank(tmpValue)) {
+ this.managerAuthSecretKey = tmpValue.trim();
+ }
+ // read enable startup using local meta file
+ tmpValue = compatGetValue(this.props,
+ KEY_ENABLE_STARTUP_USING_LOCAL_META_FILEV2,
KEY_ENABLE_STARTUP_USING_LOCAL_META_FILE);
+ if (StringUtils.isNotEmpty(tmpValue)) {
+ this.enableStartupUsingLocalMetaFile =
"TRUE".equalsIgnoreCase(tmpValue.trim());
+ }
+ // read configure sync interval
+ tmpValue = compatGetValue(this.props,
+ KEY_META_CONFIG_SYNC_INTERVAL_MS,
KEY_CONFIG_CHECK_INTERVAL_MS);
+ if (StringUtils.isNotEmpty(tmpValue)) {
+ long tmpSyncInvMs = NumberUtils.toLong(
+ tmpValue.trim(), VAL_DEF_CONFIG_SYNC_INTERVAL_MS);
+ if (tmpSyncInvMs >= VAL_MIN_CONFIG_SYNC_INTERVAL_MS) {
+ this.metaConfigSyncInvlMs = tmpSyncInvMs;
+ }
+ }
+ // read configure sync wast alarm ms
+ tmpValue = this.props.get(KEY_META_CONFIG_SYNC_WAST_ALARM_MS);
+ if (StringUtils.isNotBlank(tmpValue)) {
+ this.metaConfigWastAlarmMs = NumberUtils.toLong(
+ tmpValue.trim(), VAL_DEF_META_CONFIG_SYNC_WAST_ALARM_MS);
}
}
@@ -644,7 +657,7 @@ public class CommonConfigHolder {
} catch (Throwable e) {
LOG.error("Fail to load properties from {}, exit!",
COMMON_CONFIG_FILE_NAME, e);
- System.exit(2);
+ System.exit(1);
return false;
} finally {
if (null != inStream) {
@@ -653,10 +666,21 @@ public class CommonConfigHolder {
} catch (IOException e) {
LOG.error("Fail to InputStream.close() for file {}, exit!",
COMMON_CONFIG_FILE_NAME, e);
- System.exit(3);
+ System.exit(1);
}
}
}
return true;
}
+
+ private String compatGetValue(Map<String, String> attrs, String newKey,
String depKey) {
+ String tmpValue = attrs.get(newKey);
+ if (StringUtils.isBlank(tmpValue)) {
+ tmpValue = attrs.get(depKey);
+ if (StringUtils.isNotEmpty(tmpValue)) {
+ LOG.warn("** Deprecated configure key {}, replaced by {} **",
depKey, newKey);
+ }
+ }
+ return tmpValue;
+ }
}
diff --git
a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/config/ConfigHolder.java
b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/config/ConfigHolder.java
index 3060d9ee26..73f2834105 100644
---
a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/config/ConfigHolder.java
+++
b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/config/ConfigHolder.java
@@ -32,7 +32,7 @@ import java.util.Date;
import java.util.List;
import java.util.concurrent.atomic.AtomicBoolean;
-import static
org.apache.inlong.dataproxy.config.ConfigManager.CONFIG_HOLDER_LIST;
+import static
org.apache.inlong.dataproxy.config.ConfigManager.CONFIG_HOLDER_MAP;
public abstract class ConfigHolder {
@@ -50,7 +50,7 @@ public abstract class ConfigHolder {
public ConfigHolder(String fileName) {
this.fileName = fileName;
setFilePath(fileName);
- CONFIG_HOLDER_LIST.add(this);
+ CONFIG_HOLDER_MAP.put(this, System.currentTimeMillis());
}
/**
diff --git
a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/config/ConfigManager.java
b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/config/ConfigManager.java
index d6a8205460..01ef883b44 100644
---
a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/config/ConfigManager.java
+++
b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/config/ConfigManager.java
@@ -45,7 +45,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.security.SecureRandom;
-import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -61,7 +60,7 @@ public class ConfigManager {
private static final Logger LOG =
LoggerFactory.getLogger(ConfigManager.class);
- public static final List<ConfigHolder> CONFIG_HOLDER_LIST = new
ArrayList<>();
+ public static final Map<ConfigHolder, Long> CONFIG_HOLDER_MAP = new
ConcurrentHashMap<>();
// whether handshake manager ok
public static final AtomicBoolean handshakeManagerOk = new
AtomicBoolean(false);
private static volatile boolean isInit = false;
@@ -91,7 +90,7 @@ public class ConfigManager {
synchronized (ConfigManager.class) {
if (!isInit) {
instance = new ConfigManager();
- for (ConfigHolder holder : CONFIG_HOLDER_LIST) {
+ for (ConfigHolder holder : CONFIG_HOLDER_MAP.keySet()) {
holder.loadFromFileToHolder();
}
ReloadConfigWorker reloadProperties =
ReloadConfigWorker.create(instance);
@@ -249,29 +248,19 @@ public class ConfigManager {
long count = 0;
long startTime;
long wstTime;
- boolean fisrtCheck = true;
LOG.info("Reload-Config Worker started!");
while (isRunning) {
- count += 1;
startTime = System.currentTimeMillis();
try {
// check and load local configure files
- for (ConfigHolder holder : CONFIG_HOLDER_LIST) {
+ for (ConfigHolder holder : CONFIG_HOLDER_MAP.keySet()) {
if (holder.checkAndUpdateHolder()) {
holder.executeCallbacks();
}
}
- // connect to manager
- if (fisrtCheck) {
- fisrtCheck = false;
+ // connect to manager for updating remote config
+ if (count % 3 == 0) {
checkRemoteConfig();
- count = 0;
- } else {
- // wait for 3 * check-time to update remote config
- if (count % 3 == 0) {
- checkRemoteConfig();
- count = 0;
- }
}
// check processing time
wstTime = System.currentTimeMillis() - startTime;
@@ -286,6 +275,8 @@ public class ConfigManager {
break;
} catch (Throwable ex2) {
LOG.error("Reload-Config Worker encounters exception,
continue process", ex2);
+ } finally {
+ count++;
}
}
LOG.info("Reload-Config Worker existed!");
@@ -310,24 +301,12 @@ public class ConfigManager {
}
private void checkRemoteConfig() {
- String proxyClusterName =
CommonConfigHolder.getInstance().getClusterName();
- String proxyClusterTag =
CommonConfigHolder.getInstance().getClusterTag();
- if (StringUtils.isBlank(proxyClusterName) ||
StringUtils.isBlank(proxyClusterTag)) {
- LOG.error("Found {} or {} is blank in {}, can't quest remote
configure!",
- CommonConfigHolder.KEY_PROXY_CLUSTER_NAME,
- CommonConfigHolder.KEY_PROXY_CLUSTER_TAG,
- CommonConfigHolder.COMMON_CONFIG_FILE_NAME);
- return;
- }
List<String> managerIpList =
CommonConfigHolder.getInstance().getManagerHosts();
- if (managerIpList == null || managerIpList.size() == 0) {
- LOG.error("Found manager ip list are empty, can't quest remote
configure!");
- return;
- }
int managerIpSize = managerIpList.size();
for (int i = 0; i < managerIpList.size(); i++) {
String host =
managerIpList.get(Math.abs(managerIpListIndex.getAndIncrement()) %
managerIpSize);
- if (this.reloadDataProxyConfig(proxyClusterName,
proxyClusterTag, host)) {
+ if
(this.reloadDataProxyConfig(CommonConfigHolder.getInstance().getClusterName(),
+ CommonConfigHolder.getInstance().getClusterTag(),
host)) {
break;
}
}
diff --git
a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/config/DefaultManagerIpListParser.java
b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/config/DefaultManagerIpListParser.java
deleted file mode 100644
index f5aa36a6e0..0000000000
---
a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/config/DefaultManagerIpListParser.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.inlong.dataproxy.config;
-
-import org.apache.commons.lang3.StringUtils;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-/**
- *
- * DefaultManagerIpListParser
- */
-public class DefaultManagerIpListParser implements IManagerIpListParser {
-
- List<String> managerIpList = new ArrayList<>();
-
- /**
- * setCommonProperties
- *
- * @param commonProperties
- */
- @Override
- public void setCommonProperties(Map<String, String> commonProperties) {
- String managerHosts =
commonProperties.get(CommonConfigHolder.KEY_MANAGER_HOSTS);
- if (StringUtils.isBlank(managerHosts)) {
- return;
- }
- String[] hostPortList = StringUtils.split(managerHosts,
- CommonConfigHolder.KEY_MANAGER_HOSTS_SEPARATOR);
- for (String hostport : hostPortList) {
- if (StringUtils.isBlank(hostport)) {
- continue;
- }
- managerIpList.add(hostport.trim());
- }
- }
-
- /**
- * getIpList
- *
- * @return manager ip-port list
- */
- @Override
- public List<String> getIpList() {
- return managerIpList;
- }
-
-}
diff --git
a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/config/IManagerIpListParser.java
b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/config/IManagerIpListParser.java
deleted file mode 100644
index 8a5c88290c..0000000000
---
a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/config/IManagerIpListParser.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.inlong.dataproxy.config;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * IManagerIpListParser
- */
-public interface IManagerIpListParser {
-
- void setCommonProperties(Map<String, String> commonProperties);
-
- /**
- * getIpList
- * @return ip:port list
- */
- List<String> getIpList();
-}
diff --git
a/inlong-dataproxy/dataproxy-source/src/test/resources/common.properties
b/inlong-dataproxy/dataproxy-source/src/test/resources/common.properties
index e37ef6cfeb..21a785ee25 100644
--- a/inlong-dataproxy/dataproxy-source/src/test/resources/common.properties
+++ b/inlong-dataproxy/dataproxy-source/src/test/resources/common.properties
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-
+manager.hosts=127.0.0.1:8080
proxy.cluster.name=proxy_inlong5th_sz
metricDomains=DataProxy
metricDomains.DataProxy.domainListeners=org.apache.inlong.dataproxy.metrics.prometheus.PrometheusMetricListener
