This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch branch-3.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-3.0 by this push:
new 451d342714a branch-3.0: [opt](log) add more info in nereids timeout
log #45705 (#45786)
451d342714a is described below
commit 451d342714a49061267c2da5479e4d40a95497a9
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Mon Dec 23 15:37:57 2024 +0800
branch-3.0: [opt](log) add more info in nereids timeout log #45705 (#45786)
Cherry-picked from #45705
Co-authored-by: Mingyu Chen (Rayner) <morning...@163.com>
---
.../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 e31c92e3fe0..1354f895a3c 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 AnalysisException(
- "Nereids cost too much time ( > " +
sessionVariable.nereidsTimeoutSecond + "s )");
+ && elapsedS > sessionVariable.nereidsTimeoutSecond) {
+ throw new AnalysisException(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
