This is an automated email from the ASF dual-hosted git repository.
morningman 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 901b93264c0 branch-2.1: [opt](log) add more info in nereids timeout
log #45705 (#45793)
901b93264c0 is described below
commit 901b93264c0ecd9502ff4845c50ec85313a07c9e
Author: Mingyu Chen (Rayner) <morning...@163.com>
AuthorDate: Mon Dec 23 17:57:38 2024 +0800
branch-2.1: [opt](log) add more info in nereids timeout log #45705 (#45793)
cherry-pick #45705
---
.../apache/doris/nereids/jobs/scheduler/SimpleJobScheduler.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/nereids/jobs/scheduler/SimpleJobScheduler.java
b/fe/fe-core/src/main/java/org/apache/doris/nereids/jobs/scheduler/SimpleJobScheduler.java
index 32a82127e6d..95f45eda263 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/nereids/jobs/scheduler/SimpleJobScheduler.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/nereids/jobs/scheduler/SimpleJobScheduler.java
@@ -34,11 +34,11 @@ public class SimpleJobScheduler implements JobScheduler {
CascadesContext context = (CascadesContext) scheduleContext;
SessionVariable sessionVariable =
context.getConnectContext().getSessionVariable();
while (!pool.isEmpty()) {
+ long elapsedS =
context.getStatementContext().getStopwatch().elapsed(TimeUnit.MILLISECONDS) /
1000;
if (sessionVariable.enableNereidsTimeout
- &&
context.getStatementContext().getStopwatch().elapsed(TimeUnit.MILLISECONDS)
- > sessionVariable.nereidsTimeoutSecond * 1000L) {
- throw new DoNotFallbackException(
- "Nereids cost too much time ( > " +
sessionVariable.nereidsTimeoutSecond + "s )");
+ && elapsedS > sessionVariable.nereidsTimeoutSecond) {
+ throw new DoNotFallbackException(String.format("Nereids cost
too much time ( %ds > %ds",
+ elapsedS, sessionVariable.nereidsTimeoutSecond));
}
Job job = pool.pop();
job.execute();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
