[enhancement](delete) Using insert timeout session var to control del…

…ete job timeout (apache#41063)
TangSiyang2001 · Sep 29, 2024 · abe4bcf · abe4bcf
1 parent 34429bf
commit abe4bcf
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/DeleteJob.java b/fe/fe-core/src/main/java/org/apache/doris/load/DeleteJob.java
@@ -120,6 +120,8 @@ public enum DeleteState {
 
  private MarkedCountDownLatch<Long, Long> countDownLatch;
 
+ private long timeoutS = 300L;
+
  public DeleteJob(long id, long transactionId, String label,
  Map<Long, Short> partitionReplicaNum, DeleteInfo deleteInfo) {
  this.id = id;
@@ -250,14 +252,16 @@ public Collection<TabletDeleteInfo> getTabletDeleteInfo() {
  return tabletDeleteInfoMap.values();
  }
 
+ public void setTimeoutS(long timeoutS) {
+ this.timeoutS = timeoutS;
+ }
+
  public long getTimeoutMs() {
  if (FeConstants.runningUnitTest) {
  // for making unit test run fast
  return 1000;
  }
- // timeout is between 30 seconds to 5 min
- long timeout = Math.max(totalTablets.size() * Config.tablet_delete_timeout_second * 1000L, 30000L);
- return Math.min(timeout, Config.delete_job_max_timeout_second * 1000L);
+ return timeoutS * 1000L;
  }
 
  public void setTargetDb(Database targetDb) {
@@ -550,6 +554,10 @@ public DeleteJob buildWith(BuildParams params) throws Exception {
  deleteJob.setTargetDb(params.getDb());
  deleteJob.setTargetTbl(params.getTable());
  deleteJob.setCountDownLatch(new MarkedCountDownLatch<>((int) replicaNum));
+ ConnectContext connectContext = ConnectContext.get();
+ if (connectContext != null) {
+ deleteJob.setTimeoutS(connectContext.getExecTimeout());
+ }
  return deleteJob;
  }
 

diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/StmtExecutor.java b/fe/fe-core/src/main/java/org/apache/doris/qe/StmtExecutor.java
@@ -479,10 +479,11 @@ public boolean isSyncLoadKindStmt() {
  return logicalPlan instanceof InsertIntoTableCommand
  || logicalPlan instanceof InsertOverwriteTableCommand
  || (logicalPlan instanceof CreateTableCommand
- && ((CreateTableCommand) logicalPlan).isCtasCommand());
+ && ((CreateTableCommand) logicalPlan).isCtasCommand())
+ || logicalPlan instanceof DeleteFromCommand;
  }
  return parsedStmt instanceof InsertStmt || parsedStmt instanceof InsertOverwriteTableStmt
- || parsedStmt instanceof CreateTableAsSelectStmt;
+ || parsedStmt instanceof CreateTableAsSelectStmt || parsedStmt instanceof DeleteStmt;
  }
 
  public boolean isAnalyzeStmt() {