This is an automated email from the ASF dual-hosted git repository.
wenweihuang 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 808cf799c8 [INLONG-10091][Agent] Delete the useless code related to
8008 listen port (#10192)
808cf799c8 is described below
commit 808cf799c8ac90737de8a924ad59f842ce048925
Author: justinwwhuang <hww_jus...@163.com>
AuthorDate: Mon May 13 12:22:19 2024 +0800
[INLONG-10091][Agent] Delete the useless code related to 8008 listen port
(#10192)
* [INLONG-10091][Agent] Delete useless code
* [INLONG-10091][Agent] Delete useless code
* [INLONG-10091][Agent] Delete useless code
* [INLONG-10091][Agent] Delete useless code
* [INLONG-10091][Agent] Delete useless code
---
docker/docker-compose/docker-compose.yml | 2 --
.../main/java/org/apache/inlong/agent/constant/AgentConstants.java | 2 --
.../src/main/java/org/apache/inlong/agent/core/HeartbeatManager.java | 5 -----
inlong-agent/agent-docker/Dockerfile | 1 -
inlong-agent/agent-docker/README.md | 2 +-
inlong-agent/conf/agent.properties | 4 ----
6 files changed, 1 insertion(+), 15 deletions(-)
diff --git a/docker/docker-compose/docker-compose.yml
b/docker/docker-compose/docker-compose.yml
index 2c941cdcd0..9434fdb6aa 100644
--- a/docker/docker-compose/docker-compose.yml
+++ b/docker/docker-compose/docker-compose.yml
@@ -99,8 +99,6 @@ services:
- DATAPROXY_IP=dataproxy
- DATAPROXY_PORT=46801
- AUDIT_PROXY_URL=audit:10081
- ports:
- - "8008:8008"
volumes:
- ./collect-data:/data/collect-data
diff --git
a/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/constant/AgentConstants.java
b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/constant/AgentConstants.java
index 36c5423ca3..0d67e55f82 100755
---
a/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/constant/AgentConstants.java
+++
b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/constant/AgentConstants.java
@@ -39,8 +39,6 @@ public class AgentConstants {
public static final String AGENT_FETCHER_CLASSNAME =
"agent.fetcher.classname";
public static final String AGENT_CONF_PARENT = "agent.conf.parent";
public static final String DEFAULT_AGENT_CONF_PARENT = "conf";
- public static final String AGENT_HTTP_PORT = "agent.http.port";
- public static final int DEFAULT_AGENT_HTTP_PORT = 8008;
public static final String CHANNEL_MEMORY_CAPACITY =
"channel.memory.capacity";
public static final int DEFAULT_CHANNEL_MEMORY_CAPACITY = 2000;
public static final String JOB_NUMBER_LIMIT = "job.number.limit";
diff --git
a/inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/HeartbeatManager.java
b/inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/HeartbeatManager.java
index f37a13fa93..d9879586f8 100644
---
a/inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/HeartbeatManager.java
+++
b/inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/HeartbeatManager.java
@@ -39,9 +39,7 @@ import static java.util.concurrent.TimeUnit.SECONDS;
import static
org.apache.inlong.agent.constant.AgentConstants.AGENT_CLUSTER_IN_CHARGES;
import static
org.apache.inlong.agent.constant.AgentConstants.AGENT_CLUSTER_NAME;
import static
org.apache.inlong.agent.constant.AgentConstants.AGENT_CLUSTER_TAG;
-import static org.apache.inlong.agent.constant.AgentConstants.AGENT_HTTP_PORT;
import static org.apache.inlong.agent.constant.AgentConstants.AGENT_NODE_GROUP;
-import static
org.apache.inlong.agent.constant.AgentConstants.DEFAULT_AGENT_HTTP_PORT;
import static
org.apache.inlong.agent.constant.FetcherConstants.AGENT_MANAGER_HEARTBEAT_HTTP_PATH;
import static
org.apache.inlong.agent.constant.FetcherConstants.DEFAULT_AGENT_MANAGER_HEARTBEAT_HTTP_PATH;
@@ -148,7 +146,6 @@ public class HeartbeatManager extends AbstractDaemon
implements AbstractHeartbea
*/
private HeartbeatMsg buildHeartbeatMsg() {
final String agentIp = AgentUtils.fetchLocalIp();
- final int agentPort = conf.getInt(AGENT_HTTP_PORT,
DEFAULT_AGENT_HTTP_PORT);
final String clusterName = conf.get(AGENT_CLUSTER_NAME);
final String clusterTag = conf.get(AGENT_CLUSTER_TAG);
final String inCharges = conf.get(AGENT_CLUSTER_IN_CHARGES);
@@ -156,7 +153,6 @@ public class HeartbeatManager extends AbstractDaemon
implements AbstractHeartbea
HeartbeatMsg heartbeatMsg = new HeartbeatMsg();
heartbeatMsg.setIp(agentIp);
- heartbeatMsg.setPort(String.valueOf(agentPort));
heartbeatMsg.setComponentType(ComponentTypeEnum.Agent.getType());
heartbeatMsg.setReportTime(System.currentTimeMillis());
if (StringUtils.isNotBlank(clusterName)) {
@@ -183,7 +179,6 @@ public class HeartbeatManager extends AbstractDaemon
implements AbstractHeartbea
heartbeatMsg.setNodeSrvStatus(NodeSrvStatus.SERVICE_UNINSTALL);
heartbeatMsg.setInCharges(conf.get(AGENT_CLUSTER_IN_CHARGES));
heartbeatMsg.setIp(AgentUtils.fetchLocalIp());
- heartbeatMsg.setPort(String.valueOf(conf.getInt(AGENT_HTTP_PORT,
DEFAULT_AGENT_HTTP_PORT)));
heartbeatMsg.setComponentType(ComponentTypeEnum.Agent.getType());
heartbeatMsg.setClusterName(conf.get(AGENT_CLUSTER_NAME));
heartbeatMsg.setClusterTag(conf.get(AGENT_CLUSTER_TAG));
diff --git a/inlong-agent/agent-docker/Dockerfile
b/inlong-agent/agent-docker/Dockerfile
index 9080b660ff..edb9700581 100644
--- a/inlong-agent/agent-docker/Dockerfile
+++ b/inlong-agent/agent-docker/Dockerfile
@@ -27,7 +27,6 @@ ADD ${AGENT_TARBALL} /opt/inlong-agent
RUN cp /usr/share/java/snappy-java.jar lib/snappy-java-*.jar
# add mysql connector
RUN wget -P lib/
https://repo1.maven.org/maven2/mysql/mysql-connector-java/8.0.28/mysql-connector-java-8.0.28.jar
-EXPOSE 8008
ENV MANAGER_OPENAPI_IP=127.0.0.1
ENV MANAGER_OPENAPI_PORT=8082
ENV DATAPROXY_IP=127.0.0.1
diff --git a/inlong-agent/agent-docker/README.md
b/inlong-agent/agent-docker/README.md
index 5cf1d9d535..8ae753cb5b 100644
--- a/inlong-agent/agent-docker/README.md
+++ b/inlong-agent/agent-docker/README.md
@@ -8,7 +8,7 @@ docker pull inlong/agent:latest
##### Start Container
```
-docker run -d --name agent -p 8008:8008 \
+docker run -d --name agent \
-e MANAGER_OPENAPI_IP=manager_opeapi_ip -e DATAPROXY_IP=dataproxy_ip \
-e MANAGER_OPENAPI_AUTH_ID=auth_id -e MANAGER_OPENAPI_AUTH_KEY=auth_key \
-e MANAGER_OPENAPI_PORT=8082 -e DATAPROXY_PORT=46801 inlong/agent
diff --git a/inlong-agent/conf/agent.properties
b/inlong-agent/conf/agent.properties
index 3a2c4631b2..86c2e3165a 100755
--- a/inlong-agent/conf/agent.properties
+++ b/inlong-agent/conf/agent.properties
@@ -22,10 +22,6 @@
########################
# bdb data readonly
agent.localStore.readonly=false
-# whether enable http service
-agent.http.enable=true
-# http default port
-agent.http.port=8008
######################
# fetch center
