(inlong) branch master updated: [INLONG-9528][Manager] Support configuring the switch to enable dataproxy nodes (#9531)

[dockerzhang]

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 452b32676d [INLONG-9528][Manager] Support configuring the switch to 
enable dataproxy nodes (#9531)
452b32676d is described below

commit 452b32676d3d78d6ee4e7170244960f226ffea94
Author: fuweng11 <76141879+fuwen...@users.noreply.github.com>
AuthorDate: Wed Dec 27 17:30:52 2023 +0800

    [INLONG-9528][Manager] Support configuring the switch to enable dataproxy 
nodes (#9531)
---
 .../pojo/cluster/dataproxy/DataProxyClusterNodeDTO.java     |  4 ++++
 .../pojo/cluster/dataproxy/DataProxyClusterNodeRequest.java |  3 +++
 .../cluster/dataproxy/DataProxyClusterNodeResponse.java     |  3 +++
 .../manager/service/cluster/InlongClusterServiceImpl.java   | 13 +++++++++----
 4 files changed, 19 insertions(+), 4 deletions(-)

diff --git 
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/cluster/dataproxy/DataProxyClusterNodeDTO.java
 
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/cluster/dataproxy/DataProxyClusterNodeDTO.java
index af44f1c7b5..03f7ad27fa 100644
--- 
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/cluster/dataproxy/DataProxyClusterNodeDTO.java
+++ 
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/cluster/dataproxy/DataProxyClusterNodeDTO.java
@@ -44,12 +44,16 @@ public class DataProxyClusterNodeDTO {
     @ApiModelProperty("Report source type")
     private String reportSourceType = ReportResourceType.INLONG;
 
+    @ApiModelProperty("Enabled")
+    private Boolean enabledOnline = true;
+
     /**
      * Get the dto instance from the request
      */
     public static DataProxyClusterNodeDTO 
getFromRequest(DataProxyClusterNodeRequest request) {
         return DataProxyClusterNodeDTO.builder()
                 .reportSourceType(request.getReportSourceType())
+                .enabledOnline(request.getEnabledOnline())
                 .build();
     }
 
diff --git 
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/cluster/dataproxy/DataProxyClusterNodeRequest.java
 
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/cluster/dataproxy/DataProxyClusterNodeRequest.java
index 2d9c7007b2..65c4052597 100644
--- 
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/cluster/dataproxy/DataProxyClusterNodeRequest.java
+++ 
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/cluster/dataproxy/DataProxyClusterNodeRequest.java
@@ -40,4 +40,7 @@ public class DataProxyClusterNodeRequest extends 
ClusterNodeRequest {
     @ApiModelProperty("Report source type")
     private String reportSourceType;
 
+    @ApiModelProperty("Enabled")
+    private Boolean enabledOnline;
+
 }
diff --git 
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/cluster/dataproxy/DataProxyClusterNodeResponse.java
 
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/cluster/dataproxy/DataProxyClusterNodeResponse.java
index 56469c6681..d5c4bb648b 100644
--- 
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/cluster/dataproxy/DataProxyClusterNodeResponse.java
+++ 
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/cluster/dataproxy/DataProxyClusterNodeResponse.java
@@ -40,4 +40,7 @@ public class DataProxyClusterNodeResponse extends 
ClusterNodeResponse {
     @ApiModelProperty("Report source type")
     private String reportSourceType;
 
+    @ApiModelProperty("Enabled")
+    private Boolean enabledOnline;
+
 }
diff --git 
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/cluster/InlongClusterServiceImpl.java
 
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/cluster/InlongClusterServiceImpl.java
index f1bcfa3ab1..7f8ba98c00 100644
--- 
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/cluster/InlongClusterServiceImpl.java
+++ 
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/cluster/InlongClusterServiceImpl.java
@@ -1158,10 +1158,12 @@ public class InlongClusterServiceImpl implements 
InlongClusterService {
         // TODO consider the data proxy load and re-balance
         List<DataProxyNodeInfo> nodeList = new ArrayList<>();
         for (InlongClusterNodeEntity nodeEntity : nodeEntities) {
-            if (Objects.equals(nodeEntity.getStatus(), 
NodeStatus.HEARTBEAT_TIMEOUT.getStatus())) {
-                LOGGER.debug("dataproxy node was timeout, parentId={} ip={} 
port={}", nodeEntity.getParentId(),
-                        nodeEntity.getIp(), nodeEntity.getPort());
-                continue;
+            if (StringUtils.isNotBlank(nodeEntity.getExtParams())) {
+                DataProxyClusterNodeDTO dataProxyClusterNodeDTO = 
DataProxyClusterNodeDTO.getFromJson(
+                        nodeEntity.getExtParams());
+                if (Objects.equals(dataProxyClusterNodeDTO.getEnabledOnline(), 
false)) {
+                    continue;
+                }
             }
             DataProxyNodeInfo nodeInfo = new DataProxyNodeInfo();
             nodeInfo.setId(nodeEntity.getId());
@@ -1216,6 +1218,9 @@ public class InlongClusterServiceImpl implements 
InlongClusterService {
                         dataProxyClusterNodeDTO.getReportSourceType(), 
reportSourceType)) {
                     continue;
                 }
+                if (Objects.equals(dataProxyClusterNodeDTO.getEnabledOnline(), 
false)) {
+                    continue;
+                }
             }
             DataProxyNodeInfo nodeInfo = new DataProxyNodeInfo();
             nodeInfo.setId(nodeEntity.getId());