[inlong] branch master updated: [INLONG-8739][Manager] Fix The file collection task was mistakenly deleted (#8740)

[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 bc63709f92 [INLONG-8739][Manager] Fix The file collection task was 
mistakenly deleted (#8740)
bc63709f92 is described below

commit bc63709f92bbf8acf417be9bd43403667534879d
Author: fuweng11 <76141879+fuwen...@users.noreply.github.com>
AuthorDate: Wed Aug 16 14:12:31 2023 +0800

    [INLONG-8739][Manager] Fix The file collection task was mistakenly deleted 
(#8740)
---
 .../service/heartbeat/HeartbeatServiceImpl.java    |  1 -
 .../service/core/impl/AgentServiceTest.java        | 30 +++++++++++++++++++---
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git 
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/heartbeat/HeartbeatServiceImpl.java
 
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/heartbeat/HeartbeatServiceImpl.java
index 5b2cd5e46d..d3f634f769 100644
--- 
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/heartbeat/HeartbeatServiceImpl.java
+++ 
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/heartbeat/HeartbeatServiceImpl.java
@@ -87,7 +87,6 @@ public class HeartbeatServiceImpl implements HeartbeatService 
{
         ComponentTypeEnum componentType = 
ComponentTypeEnum.forType(request.getComponentType());
         switch (componentType) {
             case Agent:
-                return updateAgentHeartbeatOpt(request);
             case Sort:
             case DataProxy:
             case Cache:
diff --git 
a/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/core/impl/AgentServiceTest.java
 
b/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/core/impl/AgentServiceTest.java
index c8d127c505..0806c603d4 100644
--- 
a/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/core/impl/AgentServiceTest.java
+++ 
b/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/core/impl/AgentServiceTest.java
@@ -236,16 +236,38 @@ class AgentServiceTest extends ServiceBaseTest {
         // unbind group and mismatch
         bindGroup(false, "group1");
         TaskResult t1 = agent.pullTask();
-        Assertions.assertEquals(0, t1.getDataConfigs().size());
+        Assertions.assertEquals(1, t1.getDataConfigs().size());
+        Assertions.assertEquals(1, t1.getDataConfigs().stream()
+                .filter(dataConfig -> Integer.valueOf(dataConfig.getOp()) == 
ManagerOpEnum.FROZEN.getType())
+                .collect(Collectors.toSet())
+                .size());
+        DataConfig d1 = t1.getDataConfigs().get(0);
+        Assertions.assertEquals(sourceId, d1.getTaskId());
 
         // bind group and rematch
         bindGroup(true, "group1");
         TaskResult t2 = agent.pullTask();
-        Assertions.assertEquals(1, t2.getDataConfigs().size());
-        Assertions.assertEquals(1, t2.getDataConfigs().stream()
-                .filter(dataConfig -> Integer.valueOf(dataConfig.getOp()) == 
ManagerOpEnum.ADD.getType())
+        Assertions.assertEquals(0, t2.getDataConfigs().size());
+        Assertions.assertEquals(0, t2.getDataConfigs().stream()
+                .filter(dataConfig -> Integer.valueOf(dataConfig.getOp()) == 
ManagerOpEnum.ACTIVE.getType())
+                .collect(Collectors.toSet())
+                .size());
+
+        // update group to config success
+        final String groupId = sourceService.listSource(groupStream.getLeft(), 
groupStream.getRight()).stream()
+                .filter(source -> source.getTemplateId() != null)
+                .findAny()
+                .get()
+                .getInlongGroupId();
+        groupMapper.updateStatus(groupId, 
GroupStatus.CONFIG_SUCCESSFUL.getCode(), GLOBAL_OPERATOR);
+        TaskResult t3 = agent.pullTask();
+        Assertions.assertEquals(1, t3.getDataConfigs().size());
+        Assertions.assertEquals(1, t3.getDataConfigs().stream()
+                .filter(dataConfig -> Integer.valueOf(dataConfig.getOp()) == 
ManagerOpEnum.ACTIVE.getType())
                 .collect(Collectors.toSet())
                 .size());
+        DataConfig d3 = t3.getDataConfigs().get(0);
+        Assertions.assertEquals(sourceId, d3.getTaskId());
     }
 
     /**