This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.1 by this push:
new 036906f0259 [fix](routine load) make the timeout of load channel
consistent with routine load task (#42042) (#42267)
036906f0259 is described below
commit 036906f025984b2e5948a6b9a8bc4a45668e5601
Author: hui lai <[email protected]>
AuthorDate: Wed Oct 23 16:17:39 2024 +0800
[fix](routine load) make the timeout of load channel consistent with
routine load task (#42042) (#42267)
pick (#42042)
Routine load task timeout is max_batch_interval * 10, but load channel
timeout is max_batch_interval * 2.
---
.../main/java/org/apache/doris/load/routineload/RoutineLoadJob.java | 2 +-
.../src/main/java/org/apache/doris/planner/StreamLoadPlanner.java | 6 ------
2 files changed, 1 insertion(+), 7 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 9310e4cd263..46682e08bdc 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
@@ -581,7 +581,7 @@ public abstract class RoutineLoadJob extends
AbstractTxnStateChangeCallback impl
@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 97da7743c2c..3f2cdba68a1 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
@@ -272,12 +272,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]
