This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.1 by this push:
new f3dbd4800fd branch-2.1: [Audit](fix) fix audit log lost for npe #44145
(#45189)
f3dbd4800fd is described below
commit f3dbd4800fdf8873bb7d7083113575e971c9be8a
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Mon Dec 9 18:32:14 2024 +0800
branch-2.1: [Audit](fix) fix audit log lost for npe #44145 (#45189)
Cherry-picked from #44145
Co-authored-by: shee <13843187+qz...@users.noreply.github.com>
Co-authored-by: garenshi <garen...@tencent.com>
---
fe/fe-core/src/main/java/org/apache/doris/qe/AuditLogHelper.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/AuditLogHelper.java
b/fe/fe-core/src/main/java/org/apache/doris/qe/AuditLogHelper.java
index d10e1bbfbb8..031a01b32d2 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/AuditLogHelper.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/AuditLogHelper.java
@@ -241,7 +241,7 @@ public class AuditLogHelper {
auditEventBuilder.setStmt(origStmt);
}
if (!Env.getCurrentEnv().isMaster()) {
- if (ctx.executor.isForwardToMaster()) {
+ if (ctx.executor != null && ctx.executor.isForwardToMaster()) {
auditEventBuilder.setState(ctx.executor.getProxyStatus());
int proxyStatusCode = ctx.executor.getProxyStatusCode();
if (proxyStatusCode != 0) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
