[inlong] branch master updated: [INLONG-6531][Manager] Add load value in the response of getIpList method (addendum) (#6553)

[gosonzhang]

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 8ff76f498 [INLONG-6531][Manager] Add load value in the response of 
getIpList method (addendum) (#6553)
8ff76f498 is described below

commit 8ff76f49896bff9f9e018e7528491b2cace6af81
Author: Goson Zhang <4675...@qq.com>
AuthorDate: Tue Nov 15 20:30:56 2022 +0800

    [INLONG-6531][Manager] Add load value in the response of getIpList method 
(addendum) (#6553)
---
 .../apache/inlong/manager/service/heartbeat/HeartbeatManager.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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 fa5e17a7b..8401c76a3 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
@@ -129,7 +129,7 @@ public class HeartbeatManager implements 
AbstractHeartbeatManager {
                 if (clusterNode == null) {
                     handlerNum += insertClusterNode(clusterInfo, heartbeatMsg, 
clusterInfo.getCreator());
                 } else {
-                    handlerNum += updateClusterNode(clusterNode);
+                    handlerNum += updateClusterNode(clusterNode, heartbeatMsg);
                 }
             }
         }
@@ -192,7 +192,6 @@ public class HeartbeatManager implements 
AbstractHeartbeatManager {
         nodeRequest.setIp(heartbeat.getIp());
         nodeRequest.setPort(Integer.valueOf(heartbeat.getPort()));
         nodeRequest.setProtocolType(heartbeat.getProtocolType());
-        nodeRequest.setNodeLoad(heartbeat.getLoad());
         return clusterNodeMapper.selectByUniqueKey(nodeRequest);
     }
 
@@ -211,8 +210,9 @@ public class HeartbeatManager implements 
AbstractHeartbeatManager {
         return clusterNodeMapper.insertOnDuplicateKeyUpdate(clusterNode);
     }
 
-    private int updateClusterNode(InlongClusterNodeEntity clusterNode) {
+    private int updateClusterNode(InlongClusterNodeEntity clusterNode, 
HeartbeatMsg heartbeat) {
         clusterNode.setStatus(ClusterStatus.NORMAL.getStatus());
+        clusterNode.setNodeLoad(heartbeat.getLoad());
         return clusterNodeMapper.updateById(clusterNode);
     }