Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[INLONG-8035][Manager] Fix Non-file tasks cannot be recovered from the heartbeat timeout state #8037

Merged
merged 2 commits into from
May 16, 2023
Merged

[INLONG-8035][Manager] Fix Non-file tasks cannot be recovered from the heartbeat timeout state #8037

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ea7769a
[INLONG-8035][Manager] Fix Non-file tasks cannot be recovered from th…
fuweng11 May 16, 2023
a44ef1d
[INLONG-8035][Manager] Add CHANGES.md
fuweng11 May 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@

# InLong Changelog

<!---
Expand Down Expand Up @@ -49,6 +50,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 |
Expand Down
4 changes: 2 additions & 2 deletions ...r-service/src/main/java/org/apache/inlong/manager/service/core/impl/AgentServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -493,8 +493,8 @@ private void preProcessLabelFileTasks(TaskRequest taskRequest) {

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);
Expand Down
6 changes: 2 additions & 4 deletions ...r-service/src/main/java/org/apache/inlong/manager/service/heartbeat/HeartbeatManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
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;
Expand All @@ -35,7 +34,6 @@
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;
Expand Down Expand Up @@ -180,8 +178,8 @@ public void reportHeartbeat(HeartbeatMsg heartbeat) {
// 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);
Expand Down
4 changes: 2 additions & 2 deletions inlong-manager/manager-web/src/main/resources/application-dev.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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