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
Original file line number Diff line number Diff line change
Expand Up @@ -1231,6 +1231,10 @@ public byte[] getSqlState() {
return sqlState;
}

public String getErrorMsg() {
return errorMsg;
}

public String formatErrorMsg(Object... args) {
try {
return String.format(errorMsg, args);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,11 @@ public static void logAuditLog(ConnectContext ctx, String origStmt, StatementBas
if (!Env.getCurrentEnv().isMaster()) {
if (ctx.executor.isForwardToMaster()) {
ctx.getAuditEventBuilder().setState(ctx.executor.getProxyStatus());
int proxyStatusCode = ctx.executor.getProxyStatusCode();
if (proxyStatusCode != 0) {
ctx.getAuditEventBuilder().setErrorCode(proxyStatusCode);
ctx.getAuditEventBuilder().setErrorMessage(ctx.executor.getProxyErrMsg());
}
}
}
Env.getCurrentAuditEventProcessor().handleAuditEvent(ctx.getAuditEventBuilder().build());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -555,6 +555,12 @@ public TMasterOpResult proxyExecute(TMasterOpRequest request) {
result.setMaxJournalId(Env.getCurrentEnv().getMaxJournalId());
result.setPacket(getResultPacket());
result.setStatus(ctx.getState().toString());
if (ctx.getState().getStateType() == MysqlStateType.OK) {
result.setStatusCode(0);
} else {
result.setStatusCode(ctx.getState().getErrorCode().getCode());
result.setErrMessage(ctx.getState().getErrorMessage());
}
if (executor != null && executor.getProxyResultSet() != null) {
result.setResultSet(executor.getProxyResultSet().tothrift());
}
Expand Down
18 changes: 18 additions & 0 deletions fe/fe-core/src/main/java/org/apache/doris/qe/MasterOpExecutor.java
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import org.apache.doris.catalog.Env;
import org.apache.doris.common.ClientPool;
import org.apache.doris.common.DdlException;
import org.apache.doris.common.ErrorCode;
import org.apache.doris.thrift.FrontendService;
import org.apache.doris.thrift.TMasterOpRequest;
import org.apache.doris.thrift.TMasterOpResult;
Expand Down Expand Up @@ -206,6 +207,23 @@ public String getProxyStatus() {
}
}

public int getProxyStatusCode() {
if (result == null || !result.isSetStatusCode()) {
return ErrorCode.ERR_UNKNOWN_ERROR.getCode();
}
return result.getStatusCode();
}

public String getProxyErrMsg() {
if (result == null) {
return ErrorCode.ERR_UNKNOWN_ERROR.getErrorMsg();
}
if (!result.isSetErrMessage()) {
return "";
}
return result.getErrMessage();
}

public ShowResultSet getProxyResultSet() {
if (result == null) {
return null;
Expand Down
14 changes: 14 additions & 0 deletions fe/fe-core/src/main/java/org/apache/doris/qe/StmtExecutor.java
Original file line number Diff line number Diff line change
Expand Up @@ -396,6 +396,20 @@ public String getProxyStatus() {
return masterOpExecutor.getProxyStatus();
}

public int getProxyStatusCode() {
if (masterOpExecutor == null) {
return MysqlStateType.UNKNOWN.ordinal();
}
return masterOpExecutor.getProxyStatusCode();
}

public String getProxyErrMsg() {
if (masterOpExecutor == null) {
return MysqlStateType.UNKNOWN.name();
}
return masterOpExecutor.getProxyErrMsg();
}

public boolean isSyncLoadKindStmt() {
if (parsedStmt == null) {
return false;
Expand Down
2 changes: 2 additions & 0 deletions gensrc/thrift/FrontendService.thrift
Original file line number Diff line number Diff line change
Expand Up @@ -530,6 +530,8 @@ struct TMasterOpResult {
3: optional TShowResultSet resultSet;
4: optional Types.TUniqueId queryId;
5: optional string status;
6: optional i32 statusCode;
7: optional string errMessage;
}

struct TUpdateExportTaskStatusRequest {
Expand Down