Skip to content

[fix](routine load) make the timeout of load channel consistent with routine load task #42042

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

Merged
liaoxin01 merged 1 commit into from
Oct 20, 2024
Merged

[fix](routine load) make the timeout of load channel consistent with routine load task #42042

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 1 addition & 1 deletion fe/fe-core/src/main/java/org/apache/doris/load/routineload/RoutineLoadJob.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -620,7 +620,7 @@ public long getTxnId() {

@Override
public int getTimeout() {
return (int) getMaxBatchIntervalS();
return (int) getMaxBatchIntervalS() * Config.routine_load_task_timeout_multiplier;
}

@Override
Expand Down
7 changes: 0 additions & 7 deletions fe/fe-core/src/main/java/org/apache/doris/planner/StreamLoadPlanner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -287,12 +286,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;
Expand Down