Skip to content

Commit

Permalink
[branch-2.0](fix) Fix broken exception message apache#27836
Browse files Browse the repository at this point in the history
  • Loading branch information
zhiqiang-hhhh authored Dec 1, 2023
1 parent a3a093e commit 5f544a1
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions fe/fe-core/src/main/java/org/apache/doris/qe/Coordinator.java
Original file line number Diff line number Diff line change
Expand Up @@ -877,7 +877,7 @@ private void waitRpc(List<Triple<BackendExecStates, BackendServiceProxy, Future<
if (leftTimeMs <= 0) {
long elapsed = (System.currentTimeMillis() - timeoutDeadline) / 1000 + queryOptions.getExecutionTimeout();
String msg = String.format(
"timeout before waiting {} rpc, query timeout: {}, already elapsed:{}, left for this:{}",
"timeout before waiting %s rpc, query timeout:%d, already elapsed:%d, left for this:%d",
operation, queryOptions.getExecutionTimeout(), elapsed, leftTimeMs);

LOG.warn("Query {} {}", DebugUtil.printId(queryId), msg);
Expand Down Expand Up @@ -910,8 +910,8 @@ private void waitRpc(List<Triple<BackendExecStates, BackendServiceProxy, Future<
} catch (TimeoutException e) {
exception = e;
errMsg = String.format(
"timeout when waiting for {} rpc, query timeout {}, left timeout for this operation: {}",
operation, queryOptions.getExecutionTimeout(), timeoutMs / 10000);
"timeout when waiting for %s rpc, query timeout:%d, left timeout for this operation:%d",
operation, queryOptions.getExecutionTimeout(), timeoutMs / 1000);
LOG.warn("Query {} {}", DebugUtil.printId(queryId), errMsg);
code = TStatusCode.TIMEOUT;
}
Expand Down Expand Up @@ -952,7 +952,7 @@ private void waitPipelineRpc(List<Triple<PipelineExecContexts, BackendServicePro
if (leftTimeMs <= 0) {
long elapsed = (System.currentTimeMillis() - timeoutDeadline) / 1000 + queryOptions.getExecutionTimeout();
String msg = String.format(
"timeout before waiting {} rpc, query timeout: {}, already elapsed:{}, left for this:{}",
"timeout before waiting %s rpc, query timeout:%d, already elapsed:%d, left for this:%d",
operation, queryOptions.getExecutionTimeout(), elapsed, leftTimeMs);
LOG.warn("Query {} {}", DebugUtil.printId(queryId), msg);
throw new UserException(msg);
Expand Down Expand Up @@ -984,8 +984,8 @@ private void waitPipelineRpc(List<Triple<PipelineExecContexts, BackendServicePro
} catch (TimeoutException e) {
exception = e;
errMsg = String.format(
"timeout when waiting for {} rpc, query timeout {}, left timeout for this operation: {}",
operation, queryOptions.getExecutionTimeout(), timeoutMs / 10000);
"timeout when waiting for %s rpc, query timeout:%d, left timeout for this operation:%d",
operation, queryOptions.getExecutionTimeout(), timeoutMs / 1000);
LOG.warn("Query {} {}", DebugUtil.printId(queryId), errMsg);
code = TStatusCode.TIMEOUT;
}
Expand Down

0 comments on commit 5f544a1

Please sign in to comment.