This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch branch-4.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-4.0 by this push:
new 34be4746c7d branch-4.0: [fix](coordinator) prefer to cancel(Timeout)
than cancel(Finished) #58448 (#58452)
34be4746c7d is described below
commit 34be4746c7df20eab33b655b8e5a590fd450d634
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Fri Nov 28 10:11:49 2025 +0800
branch-4.0: [fix](coordinator) prefer to cancel(Timeout) than
cancel(Finished) #58448 (#58452)
Cherry-picked from #58448
Co-authored-by: 924060929 <[email protected]>
---
.../src/main/java/org/apache/doris/qe/runtime/QueryProcessor.java | 3 +++
1 file changed, 3 insertions(+)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/qe/runtime/QueryProcessor.java
b/fe/fe-core/src/main/java/org/apache/doris/qe/runtime/QueryProcessor.java
index 995dcb32a21..4ab7f041f59 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/runtime/QueryProcessor.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/runtime/QueryProcessor.java
@@ -17,6 +17,7 @@
package org.apache.doris.qe.runtime;
+import org.apache.doris.common.QueryTimeoutException;
import org.apache.doris.common.Status;
import org.apache.doris.common.UserException;
import org.apache.doris.common.util.DebugUtil;
@@ -132,6 +133,8 @@ public class QueryProcessor extends AbstractJobProcessor {
tryFinishSchedule();
}
return resultBatch;
+ } catch (QueryTimeoutException e) {
+ throw e;
} catch (Throwable t) {
tryFinishSchedule();
throw t;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
