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 2021/08/23 03:23:13 UTC
[incubator-inlong] branch master updated: [INLONG-1453] agent
connect dataproxy fail when using docker-compose (#1454)
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/incubator-inlong.git
The following commit(s) were added to refs/heads/master by this push:
new bda2d48 [INLONG-1453] agent connect dataproxy fail when using docker-compose (#1454)
bda2d48 is described below
commit bda2d48a53e6330d1b87cbb0d922ff5fd0464a81
Author: healchow <he...@gmail.com>
AuthorDate: Mon Aug 23 11:20:14 2021 +0800
[INLONG-1453] agent connect dataproxy fail when using docker-compose (#1454)
Co-authored-by: healzhou <he...@tencent.com>
---
.../plugin/fetcher/constants/FetcherConstants.java | 6 ++---
.../dataproxy/utils/ServiceDiscoveryUtils.java | 26 +++++++++-------------
.../web/controller/openapi/AgentController.java | 18 +++++++--------
3 files changed, 22 insertions(+), 28 deletions(-)
diff --git a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/fetcher/constants/FetcherConstants.java b/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/fetcher/constants/FetcherConstants.java
index 95c92f7..1611564 100644
--- a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/fetcher/constants/FetcherConstants.java
+++ b/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/fetcher/constants/FetcherConstants.java
@@ -31,16 +31,16 @@ public class FetcherConstants {
public static final String AGENT_MANAGER_VIP_HTTP_PORT = "agent.manager.vip.http.port";
public static final String AGENT_MANAGER_VIP_HTTP_PATH = "agent.manager.vip.http.managerIp.path";
- public static final String DEFAULT_AGENT_TDM_VIP_HTTP_PATH = "/getilmvirtualip";
+ public static final String DEFAULT_AGENT_TDM_VIP_HTTP_PATH = "/getInLongManagerIp";
public static final String AGENT_MANAGER_VIP_HTTP_PREFIX_PATH = "agent.manager.vip.http.prefix.path";
public static final String DEFAULT_AGENT_MANAGER_VIP_HTTP_PREFIX_PATH = "/api/inlong/manager/openapi/agent";
public static final String AGENT_MANAGER_TASK_HTTP_PATH = "agent.manager.vip.http.task.path";
- public static final String DEFAULT_AGENT_MANAGER_TASK_HTTP_PATH = "/file_agent/taskconf";
+ public static final String DEFAULT_AGENT_MANAGER_TASK_HTTP_PATH = "/fileAgent/getTaskConf";
public static final String AGENT_MANAGER_IP_CHECK_HTTP_PATH = "agent.manager.vip.http.checkIP.path";
- public static final String DEFAULT_AGENT_TDM_IP_CHECK_HTTP_PATH = "/file_agent/confirmAgentIp";
+ public static final String DEFAULT_AGENT_TDM_IP_CHECK_HTTP_PATH = "/fileAgent/confirmAgentIp";
public static final String AGENT_HTTP_APPLICATION_JSON = "application/json";
diff --git a/inlong-dataproxy-sdk/src/main/java/org/apache/inlong/dataproxy/utils/ServiceDiscoveryUtils.java b/inlong-dataproxy-sdk/src/main/java/org/apache/inlong/dataproxy/utils/ServiceDiscoveryUtils.java
index 702116c..98ebafd 100644
--- a/inlong-dataproxy-sdk/src/main/java/org/apache/inlong/dataproxy/utils/ServiceDiscoveryUtils.java
+++ b/inlong-dataproxy-sdk/src/main/java/org/apache/inlong/dataproxy/utils/ServiceDiscoveryUtils.java
@@ -21,7 +21,6 @@ import static org.apache.inlong.dataproxy.ConfigConstants.REQUEST_HEADER_AUTHORI
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
-
import java.io.BufferedReader;
import java.io.BufferedWriter;
import java.io.File;
@@ -34,7 +33,6 @@ import java.nio.charset.StandardCharsets;
import java.security.SecureRandom;
import java.util.ArrayList;
import javax.net.ssl.SSLContext;
-
import org.apache.commons.io.FileUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.http.Header;
@@ -63,6 +61,7 @@ import org.slf4j.LoggerFactory;
* Created by elroyzhang on 2018/5/10.
*/
public class ServiceDiscoveryUtils {
+
private static final Logger log = LoggerFactory.getLogger(ServiceDiscoveryUtils.class);
private static String latestManagerIPList = "";
@@ -76,15 +75,13 @@ public class ServiceDiscoveryUtils {
return null;
}
-
managerIpList = getManagerIpListByHttp(managerAddress, proxyClientConfig);
if (!StringUtils.isBlank(managerIpList)) {
latestManagerIPList = managerIpList;
return managerIpList;
}
log.error("ServiceDiscovery get managerIpList from "
- + "managerHost occur error, will try to get from managerIpList.");
-
+ + "managerHost occur error, will try to get from managerIpList.");
String[] managerIps = latestManagerIPList.split(arraySed);
if (managerIps.length > 0) {
@@ -102,19 +99,15 @@ public class ServiceDiscoveryUtils {
}
} else {
log.error("ServiceDiscovery managerIp is null, "
- + "lastestManagerIPList is [" + latestManagerIPList
- + "].");
+ + "latestManagerIPList is [" + latestManagerIPList
+ + "].");
}
}
} else {
log.error("ServiceDiscovery latestManagerIpList["
- + latestManagerIPList + "] format error, or not contain ip");
+ + latestManagerIPList + "] format error, or not contain ip");
}
-
-
-
-
String existedTdmIpList = getLocalManagerIpList(proxyClientConfig.getManagerIpLocalPath());
if (!StringUtils.isBlank(existedTdmIpList)) {
String[] existedTdmIps = existedTdmIpList.split(arraySed);
@@ -151,8 +144,9 @@ public class ServiceDiscoveryUtils {
}
public static String getManagerIpListByHttp(String managerIp,
- ProxyClientConfig proxyClientConfig) throws ProxysdkException {
- String url = (proxyClientConfig.isLocalVisit() ? "http://" : "https://") + managerIp + "/api/getmanagervirtualip";
+ ProxyClientConfig proxyClientConfig) throws ProxysdkException {
+ String url =
+ (proxyClientConfig.isLocalVisit() ? "http://" : "https://") + managerIp + "/api/getmanagervirtualip";
ArrayList<BasicNameValuePair> params = new ArrayList<BasicNameValuePair>();
params.add(new BasicNameValuePair("operation", "query"));
params.add(new BasicNameValuePair("username", proxyClientConfig.getUserName()));
@@ -230,7 +224,7 @@ public class ServiceDiscoveryUtils {
File managerIpListFile = new File(managerIpLocalPath);
if (!managerIpListFile.exists()) {
log.info("ServiceDiscovery no found local bidInfo file, "
- + "doesn't matter, path is [" + managerIpLocalPath + "].");
+ + "doesn't matter, path is [" + managerIpLocalPath + "].");
return null;
}
byte[] serialized;
@@ -250,7 +244,7 @@ public class ServiceDiscoveryUtils {
reader.close();
} catch (IOException e) {
log.error("ServiceDiscovery close bufferedReader "
- + "error after loading TDM config . Exception info : {}.", e);
+ + "error after loading InLong Manager config . Exception info : {}.", e);
}
}
}
diff --git a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/openapi/AgentController.java b/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/openapi/AgentController.java
index 59536ca..fa349cf 100644
--- a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/openapi/AgentController.java
+++ b/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/openapi/AgentController.java
@@ -58,43 +58,43 @@ public class AgentController {
@Autowired
private AgentHeartBeatService agentHeartBeatService;
- @GetMapping("/getVirtualIp")
+ @GetMapping("/getInLongManagerIp")
@ApiOperation(value = "get inlong manager ip list")
- public Response<List<String>> getVirtualIp() {
+ public Response<List<String>> getInLongManagerIp() {
return Response.success(clusterInfoService.listClusterIpByType("inlong-openapi"));
}
- @PostMapping("/file_agent/taskconf")
+ @PostMapping("/fileAgent/getTaskConf")
@ApiOperation(value = "fetch file access task")
public Response<FileAgentTaskInfo> getFileAgentTask(@RequestBody FileAgentCommandInfo info) {
return Response.success(agentTaskService.getFileAgentTask(info));
}
- @PostMapping("/file_agent/confirmAgentIp")
+ @PostMapping("/fileAgent/confirmAgentIp")
@ApiOperation(value = "confirm current agent ip")
public Response<String> confirmAgentIp(@RequestBody ConfirmAgentIpRequest info) {
return Response.success(agentTaskService.confirmAgentIp(info));
}
- @PostMapping("/file_agent/queryAgentSysconf")
- @ApiOperation(value = "query agent system config")
+ @PostMapping("/fileAgent/getAgentSysConf")
+ @ApiOperation(value = "get agent system config")
public Response<AgentSysConfig> getAgentSysConf(@RequestBody AgentSysconfRequest info) {
return Response.success(agentSysConfigService.getAgentSysConfig(info));
}
- @PostMapping("/file_agent/heartbeat")
+ @PostMapping("/fileAgent/heartbeat")
@ApiOperation(value = "agent heartbeat report")
public Response<String> heartbeat(@RequestBody AgentHeartbeatRequest info) {
return Response.success(agentHeartBeatService.heartbeat(info));
}
- @PostMapping("/file_agent/checkAgentTaskConf")
+ @PostMapping("/fileAgent/checkAgentTaskConf")
@ApiOperation(value = "agent data source comparison")
public Response<List<FileAgentTaskConfig>> checkAgentTaskConf(@RequestBody CheckAgentTaskConfRequest info) {
return Response.success(agentTaskService.checkAgentTaskConf(info));
}
- @PostMapping("/file_agent/reportAgentStatus")
+ @PostMapping("/fileAgent/reportAgentStatus")
@ApiOperation(value = "agent status report")
public Response<String> reportAgentStatus(@RequestBody AgentStatusReportRequest info) {
return Response.success(agentTaskService.reportAgentStatus(info));