From 7056db6af43cf232674b9348c909a9f81248d5ea Mon Sep 17 00:00:00 2001 From: hui lai <1353307710@qq.com> Date: Sun, 20 Oct 2024 16:22:36 +0800 Subject: [PATCH] [fix](routine load) make the timeout of load channel consistent with routine load task (#42042) Routine load task timeout is max_batch_interval * 10, but load channel timeout is max_batch_interval * 2. --- .../org/apache/doris/load/routineload/RoutineLoadJob.java | 2 +- .../java/org/apache/doris/planner/StreamLoadPlanner.java | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/routineload/RoutineLoadJob.java b/fe/fe-core/src/main/java/org/apache/doris/load/routineload/RoutineLoadJob.java index b9985e95d08fdb..29208ca0328e81 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/load/routineload/RoutineLoadJob.java +++ b/fe/fe-core/src/main/java/org/apache/doris/load/routineload/RoutineLoadJob.java @@ -620,7 +620,7 @@ public long getTxnId() { @Override public int getTimeout() { - return (int) getMaxBatchIntervalS(); + return (int) getMaxBatchIntervalS() * Config.routine_load_task_timeout_multiplier; } @Override diff --git a/fe/fe-core/src/main/java/org/apache/doris/planner/StreamLoadPlanner.java b/fe/fe-core/src/main/java/org/apache/doris/planner/StreamLoadPlanner.java index e9430c8168241c..06d765c7bccac6 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/planner/StreamLoadPlanner.java +++ b/fe/fe-core/src/main/java/org/apache/doris/planner/StreamLoadPlanner.java @@ -45,7 +45,6 @@ import org.apache.doris.common.util.TimeUtils; import org.apache.doris.load.BrokerFileGroup; import org.apache.doris.load.loadv2.LoadTask; -import org.apache.doris.load.routineload.RoutineLoadJob; import org.apache.doris.qe.ConnectContext; import org.apache.doris.service.FrontendOptions; import org.apache.doris.task.LoadTaskInfo; @@ -290,12 +289,6 @@ public TPipelineFragmentParams plan(TUniqueId loadId, int fragmentInstanceIdInde descTable.computeStatAndMemLayout(); int timeout = taskInfo.getTimeout(); - if (taskInfo instanceof RoutineLoadJob) { - // For routine load, make the timeout fo plan fragment larger than MaxIntervalS config. - // So that the execution won't be killed before consuming finished. - timeout *= 2; - } - final boolean enableMemtableOnSinkNode = destTable.getTableProperty().getUseSchemaLightChange() ? taskInfo.isMemtableOnSinkNode() : false;