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 86dab57c163 [fix](cancel) Fix query time out not set (#43521)
86dab57c163 is described below
commit 86dab57c16328687bf9b892496dcc518784997fc
Author: zhiqiang <hezhiqi...@selectdb.com>
AuthorDate: Tue Nov 12 21:25:30 2024 +0800
[fix](cancel) Fix query time out not set (#43521)
### What problem does this PR solve?
Related PR: https://github.com/apache/doris/pull/41798
Problem Summary:
https://github.com/apache/doris/pull/41798 does not set cancel reason if
query is timeout on fe.
---
fe/fe-core/src/main/java/org/apache/doris/qe/ConnectContext.java | 3 +--
fe/fe-core/src/main/java/org/apache/doris/qe/Coordinator.java | 4 ----
2 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/ConnectContext.java
b/fe/fe-core/src/main/java/org/apache/doris/qe/ConnectContext.java
index d5bf9b9ef2d..51316630aff 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/ConnectContext.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/ConnectContext.java
@@ -54,7 +54,6 @@ import
org.apache.doris.nereids.trees.expressions.literal.Literal;
import org.apache.doris.plsql.Exec;
import org.apache.doris.plsql.executor.PlSqlOperation;
import org.apache.doris.plugin.AuditEvent.AuditEventBuilder;
-import org.apache.doris.proto.Types;
import org.apache.doris.resource.Tag;
import org.apache.doris.service.arrowflight.results.FlightSqlChannel;
import org.apache.doris.statistics.ColumnStatistic;
@@ -962,7 +961,7 @@ public class ConnectContext {
+ " connection type: {}, connectionId: {}",
getRemoteHostPortString(), killConnection,
getConnectType(), connectionId);
- executorRef.cancel(Types.PPlanFragmentCancelReason.TIMEOUT);
+ executorRef.cancel("Query timeout");
}
}
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/Coordinator.java
b/fe/fe-core/src/main/java/org/apache/doris/qe/Coordinator.java
index fee7d0442bf..7fe5cb7ef19 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/Coordinator.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/Coordinator.java
@@ -3503,10 +3503,6 @@ public class Coordinator implements CoordInterface {
fragmentId, status.toString());
}
}
- LOG.warn("Failed to cancel query {} instance
initiated={} done={} backend: {},"
- + "fragment id={}, reason: {}",
- DebugUtil.printId(queryId), initiated,
done, backend.getId(),
- fragmentId, "without status");
}
public void onFailure(Throwable t) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
