This is an automated email from the ASF dual-hosted git repository.
dockerzhang pushed a commit to branch branch-1.7
in repository https://gitbox.apache.org/repos/asf/inlong.git
The following commit(s) were added to refs/heads/branch-1.7 by this push:
new d0f950e25 [INLONG-8035][Manager] Fix Non-file tasks cannot be
recovered from the heartbeat timeout state (#8037)
d0f950e25 is described below
commit d0f950e25646cb9d51fb2d84f4975a0479dce8df
Author: fuweng11 <[email protected]>
AuthorDate: Tue May 16 15:47:19 2023 +0800
[INLONG-8035][Manager] Fix Non-file tasks cannot be recovered from the
heartbeat timeout state (#8037)
---
CHANGES.md | 2 ++
.../apache/inlong/manager/service/core/impl/AgentServiceImpl.java | 4 ++--
.../apache/inlong/manager/service/heartbeat/HeartbeatManager.java | 6 ++----
.../manager-web/src/main/resources/application-dev.properties | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/CHANGES.md b/CHANGES.md
index 496c5c568..3a14fb154 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,4 @@
+
# InLong Changelog
<!---
@@ -48,6 +49,7 @@
### Manager
| ISSUE | Summary
|
|:-----------------------------------------------------------:|:-----------------------------------------------------------------------------------------------|
+| [INLONG-8035](https://github.com/apache/inlong/issues/8035) | [Bug][Manager]
Non-file tasks cannot be recovered from the heartbeat timeout state
|
| [INLONG-8021](https://github.com/apache/inlong/issues/8021) |
[Improve][Manager] Periodically delete sources with inconsistent states
|
| [INLONG-8006](https://github.com/apache/inlong/issues/8006) |
[Improve][Manager] Set displayname for the auto-registered cluster
|
| [INLONG-7999](https://github.com/apache/inlong/issues/7999) |
[Improve][Manager] Support PostgreSQL data node
|
diff --git
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/AgentServiceImpl.java
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/AgentServiceImpl.java
index 53ccea256..e21c422d4 100644
---
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/AgentServiceImpl.java
+++
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/AgentServiceImpl.java
@@ -493,8 +493,8 @@ public class AgentServiceImpl implements AgentService {
private void preTimeoutTasks(TaskRequest taskRequest) {
// If the agent report succeeds, restore the source status
- List<Integer> needUpdateIds =
sourceMapper.selectHeartbeatTimeoutIds(Lists.newArrayList(SourceType.FILE),
- taskRequest.getAgentIp(), taskRequest.getClusterName());
+ List<Integer> needUpdateIds =
sourceMapper.selectHeartbeatTimeoutIds(null, taskRequest.getAgentIp(),
+ taskRequest.getClusterName());
// restore state for all source by ip and type
if (CollectionUtils.isNotEmpty(needUpdateIds)) {
sourceMapper.rollbackTimeoutStatusByIds(needUpdateIds, null);
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 8f2ec1b4e..3ea0ec0fd 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
@@ -23,7 +23,6 @@ import com.github.benmanes.caffeine.cache.LoadingCache;
import com.github.benmanes.caffeine.cache.RemovalCause;
import com.github.benmanes.caffeine.cache.Scheduler;
import com.google.common.base.Joiner;
-import com.google.common.collect.Lists;
import com.google.gson.Gson;
import lombok.Getter;
import lombok.SneakyThrows;
@@ -35,7 +34,6 @@ import
org.apache.inlong.common.heartbeat.AbstractHeartbeatManager;
import org.apache.inlong.common.heartbeat.ComponentHeartbeat;
import org.apache.inlong.common.heartbeat.HeartbeatMsg;
import org.apache.inlong.manager.common.consts.InlongConstants;
-import org.apache.inlong.manager.common.consts.SourceType;
import org.apache.inlong.manager.common.enums.ClusterStatus;
import org.apache.inlong.manager.common.enums.ClusterType;
import org.apache.inlong.manager.common.enums.ErrorCodeEnum;
@@ -180,8 +178,8 @@ public class HeartbeatManager implements
AbstractHeartbeatManager {
// If the agent report succeeds, restore the source status
if (Objects.equals(clusterNode.getType(),
ClusterType.AGENT)) {
// If the agent report succeeds, restore the source
status
- List<Integer> needUpdateIds =
sourceMapper.selectHeartbeatTimeoutIds(
- Lists.newArrayList(SourceType.FILE),
heartbeat.getIp(), heartbeat.getClusterName());
+ List<Integer> needUpdateIds =
sourceMapper.selectHeartbeatTimeoutIds(null, heartbeat.getIp(),
+ heartbeat.getClusterName());
// restore state for all source by ip and type
if (CollectionUtils.isNotEmpty(needUpdateIds)) {
sourceMapper.rollbackTimeoutStatusByIds(needUpdateIds, null);
diff --git
a/inlong-manager/manager-web/src/main/resources/application-dev.properties
b/inlong-manager/manager-web/src/main/resources/application-dev.properties
index d705bf953..bb2f17e5d 100644
--- a/inlong-manager/manager-web/src/main/resources/application-dev.properties
+++ b/inlong-manager/manager-web/src/main/resources/application-dev.properties
@@ -87,12 +87,12 @@ data.cleansing.batchSize=100
sort.enable.zookeeper=false
# If turned on, synchronizing change the source status when the agent
heartbeat times out
-source.update.enabled=true
+source.update.enabled=false
source.update.before.seconds=60
source.update.interval=60
# If turned on, tasks in the incorrect state are periodically deleted
-source.cleansing.enabled=true
+source.cleansing.enabled=false
source.cleansing.interval=600
