This is an automated email from the ASF dual-hosted git repository.
liaoxin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new bf949c2a261 [fix](routine load) make the timeout of load channel
consistent with routine load task (#42042)
bf949c2a261 is described below
commit bf949c2a26196745035307260239849974f256cf
Author: hui lai <[email protected]>
AuthorDate: Sun Oct 20 16:22:36 2024 +0800
[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.
---
.../java/org/apache/doris/load/routineload/RoutineLoadJob.java | 2 +-
.../src/main/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 0aaf0df9972..ecf8d3b7a6f 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 abstract class RoutineLoadJob
@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 16c9ffd8555..e1a95531989 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.UserException;
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;
@@ -309,12 +308,6 @@ public class StreamLoadPlanner {
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;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
