Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 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 @@ -1472,7 +1472,7 @@ public Future<PExecPlanFragmentResult> execRemoteFragmentAsync() throws TExcepti
} 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;
Expand All @@ -1489,9 +1489,10 @@ public boolean isDone() {
}

@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();
Expand All @@ -1500,12 +1501,10 @@ public PExecPlanFragmentResult get() throws InterruptedException, ExecutionExcep
}

@Override
public PExecPlanFragmentResult get(long timeout, TimeUnit unit)
throws InterruptedException, ExecutionException, TimeoutException {
public PExecPlanFragmentResult get(long timeout, TimeUnit unit) {
return get();
}
};
return future;
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ public void execute() throws Exception {
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;
}
Expand Down