This is an automated email from the ASF dual-hosted git repository.
kangkaisen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-doris.git
The following commit(s) were added to refs/heads/master by this push:
new 724f70a Fix all queries failed when one BE network or disk has issue
(#4651)
724f70a is described below
commit 724f70a4054154c5e3e0e7b52d1678eb44a9922f
Author: kangkaisen <[email protected]>
AuthorDate: Wed Sep 23 15:25:08 2020 +0800
Fix all queries failed when one BE network or disk has issue (#4651)
---
fe/fe-core/src/main/java/org/apache/doris/qe/Coordinator.java | 9 ++++-----
fe/fe-core/src/main/java/org/apache/doris/qe/StmtExecutor.java | 2 +-
2 files changed, 5 insertions(+), 6 deletions(-)
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 9cb6cde..89f6066 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
@@ -1523,7 +1523,7 @@ public class Coordinator {
} catch (RpcException e) {
// DO NOT throw exception here, return a complete future with
error code,
// so that the following logic will cancel the fragment.
- Future<PExecPlanFragmentResult> future = new
Future<PExecPlanFragmentResult>() {
+ return new Future<PExecPlanFragmentResult>() {
@Override
public boolean cancel(boolean mayInterruptIfRunning) {
return false;
@@ -1540,9 +1540,10 @@ public class Coordinator {
}
@Override
- public PExecPlanFragmentResult get() throws
InterruptedException, ExecutionException {
+ public PExecPlanFragmentResult get() {
PExecPlanFragmentResult result = new
PExecPlanFragmentResult();
PStatus pStatus = new PStatus();
+ pStatus.error_msgs = Lists.newArrayList();
pStatus.error_msgs.add(e.getMessage());
// use THRIFT_RPC_ERROR so that this BE will be added
to the blacklist later.
pStatus.status_code =
TStatusCode.THRIFT_RPC_ERROR.getValue();
@@ -1551,12 +1552,10 @@ public class Coordinator {
}
@Override
- public PExecPlanFragmentResult get(long timeout, TimeUnit
unit)
- throws InterruptedException, ExecutionException,
TimeoutException {
+ public PExecPlanFragmentResult get(long timeout, TimeUnit
unit) {
return get();
}
};
- return future;
}
}
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/StmtExecutor.java
b/fe/fe-core/src/main/java/org/apache/doris/qe/StmtExecutor.java
index fdff35a..5e76f24 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/StmtExecutor.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/StmtExecutor.java
@@ -281,7 +281,7 @@ public class StmtExecutor {
throw e;
}
if (!context.getMysqlChannel().isSend()) {
- LOG.warn("retry {} times. stmt: {}", (i + 1),
context.getStmtId());
+ LOG.warn("retry {} times. stmt: {}", (i + 1),
parsedStmt.getOrigStmt().originStmt);
} else {
throw e;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
