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/11/01 07:38:50 UTC
[inlong] branch master updated: [INLONG-6343][Manager] Fix the problem that the cluster tag is empty when saving cluster information (#6344)
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 4729edeb0 [INLONG-6343][Manager] Fix the problem that the cluster tag is empty when saving cluster information (#6344)
4729edeb0 is described below
commit 4729edeb0ea4e72c3f991c29034973401bb09a27
Author: fuweng11 <76...@users.noreply.github.com>
AuthorDate: Tue Nov 1 15:38:45 2022 +0800
[INLONG-6343][Manager] Fix the problem that the cluster tag is empty when saving cluster information (#6344)
---
.../org/apache/inlong/manager/service/heartbeat/HeartbeatManager.java | 4 ++++
.../inlong/manager/service/cluster/InlongClusterServiceTest.java | 1 +
.../inlong/manager/service/core/heartbeat/HeartbeatManagerTest.java | 1 +
.../apache/inlong/manager/service/core/impl/HeartbeatServiceTest.java | 1 +
4 files changed, 7 insertions(+)
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/heartbeat/HeartbeatManager.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/heartbeat/HeartbeatManager.java
index 9f3819e49..d38a92510 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/heartbeat/HeartbeatManager.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/heartbeat/HeartbeatManager.java
@@ -33,6 +33,7 @@ import org.apache.inlong.manager.common.consts.InlongConstants;
import org.apache.inlong.manager.common.enums.ClusterStatus;
import org.apache.inlong.manager.common.enums.NodeStatus;
import org.apache.inlong.manager.common.util.JsonUtils;
+import org.apache.inlong.manager.common.util.Preconditions;
import org.apache.inlong.manager.dao.entity.InlongClusterEntity;
import org.apache.inlong.manager.dao.entity.InlongClusterNodeEntity;
import org.apache.inlong.manager.dao.mapper.InlongClusterEntityMapper;
@@ -215,6 +216,9 @@ public class HeartbeatManager implements AbstractHeartbeatManager {
final String clusterName = componentHeartbeat.getClusterName();
final String type = componentHeartbeat.getComponentType();
final String clusterTag = componentHeartbeat.getClusterTag();
+ Preconditions.checkNotNull(clusterTag, "cluster tag cannot be null");
+ Preconditions.checkNotNull(type, "cluster type cannot be null");
+ Preconditions.checkNotNull(clusterName, "cluster name cannot be null");
InlongClusterEntity entity = clusterMapper.selectByNameAndType(clusterName, type);
if (null != entity) {
// TODO Load balancing needs to be considered.
diff --git a/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/cluster/InlongClusterServiceTest.java b/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/cluster/InlongClusterServiceTest.java
index 6f011875c..f5383dc18 100644
--- a/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/cluster/InlongClusterServiceTest.java
+++ b/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/cluster/InlongClusterServiceTest.java
@@ -173,6 +173,7 @@ public class InlongClusterServiceTest extends ServiceBaseTest {
HeartbeatMsg heartbeatMsg = new HeartbeatMsg();
heartbeatMsg.setIp(ip);
heartbeatMsg.setPort(port);
+ heartbeatMsg.setClusterTag("default_cluster");
heartbeatMsg.setProtocolType(ProtocolType.HTTP);
heartbeatMsg.setComponentType(type);
heartbeatMsg.setReportTime(System.currentTimeMillis());
diff --git a/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/core/heartbeat/HeartbeatManagerTest.java b/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/core/heartbeat/HeartbeatManagerTest.java
index dad85fc21..353c6a629 100644
--- a/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/core/heartbeat/HeartbeatManagerTest.java
+++ b/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/core/heartbeat/HeartbeatManagerTest.java
@@ -86,6 +86,7 @@ public class HeartbeatManagerTest extends ServiceBaseTest {
HeartbeatMsg heartbeatMsg = new HeartbeatMsg();
heartbeatMsg.setIp("127.0.0.1");
heartbeatMsg.setPort("46802");
+ heartbeatMsg.setClusterTag("default_cluster");
heartbeatMsg.setProtocolType(ProtocolType.HTTP);
heartbeatMsg.setComponentType(ComponentTypeEnum.DataProxy.getName());
heartbeatMsg.setReportTime(System.currentTimeMillis());
diff --git a/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/core/impl/HeartbeatServiceTest.java b/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/core/impl/HeartbeatServiceTest.java
index b07193684..acc3ec985 100644
--- a/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/core/impl/HeartbeatServiceTest.java
+++ b/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/core/impl/HeartbeatServiceTest.java
@@ -54,6 +54,7 @@ public class HeartbeatServiceTest extends ServiceBaseTest {
request.setComponentType(ComponentTypeEnum.DataProxy.getName());
request.setIp("127.0.0.1");
request.setPort("56802");
+ request.setClusterTag("default_cluster");
request.setReportTime(Instant.now().toEpochMilli());
request.setProtocolType(ProtocolType.HTTP);