Fix auditlog NPE

apache · Dec 23, 2024 · 7899999 · 7899999
1 parent 8f1dc58
commit 7899999
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
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
@@ -215,7 +215,7 @@ private static void logAuditLogImpl(ConnectContext ctx, String origStmt, Stateme
                 .setCommandType(ctx.getCommand().toString());
 
         if (ctx.getState().isQuery()) {
-            if (!ctx.getSessionVariable().internalSession) {
+            if (!ctx.getSessionVariable().internalSession && MetricRepo.isInit) {
                 MetricRepo.COUNTER_QUERY_ALL.increase(1L);
                 MetricRepo.USER_COUNTER_QUERY_ALL.getOrAdd(ctx.getQualifiedUser()).increase(1L);
             }
@@ -231,15 +231,15 @@ private static void logAuditLogImpl(ConnectContext ctx, String origStmt, Stateme
             if (ctx.getState().getStateType() == MysqlStateType.ERR
                     && ctx.getState().getErrType() != QueryState.ErrType.ANALYSIS_ERR) {
                 // err query
-                if (!ctx.getSessionVariable().internalSession) {
+                if (!ctx.getSessionVariable().internalSession && MetricRepo.isInit) {
                     MetricRepo.COUNTER_QUERY_ERR.increase(1L);
                     MetricRepo.USER_COUNTER_QUERY_ERR.getOrAdd(ctx.getQualifiedUser()).increase(1L);
                     MetricRepo.increaseClusterQueryErr(cloudCluster);
                 }
             } else if (ctx.getState().getStateType() == MysqlStateType.OK
                     || ctx.getState().getStateType() == MysqlStateType.EOF) {
                 // ok query
-                if (!ctx.getSessionVariable().internalSession) {
+                if (!ctx.getSessionVariable().internalSession && MetricRepo.isInit) {
                     MetricRepo.HISTO_QUERY_LATENCY.update(elapseMs);
                     MetricRepo.USER_HISTO_QUERY_LATENCY.getOrAdd(ctx.getQualifiedUser()).update(elapseMs);
                     MetricRepo.updateClusterQueryLatency(cloudCluster, elapseMs);

diff --git a/fe/fe-core/src/main/java/org/apache/doris/statistics/ColumnStatisticsCacheLoader.java b/fe/fe-core/src/main/java/org/apache/doris/statistics/ColumnStatisticsCacheLoader.java
@@ -42,7 +42,7 @@ protected Optional<ColumnStatistic> doLoad(StatisticsCacheKey key) {
                 columnStatistic = table.getColumnStatistic(key.colName);
             }
         } catch (Throwable t) {
-            LOG.warn("Failed to load stats for column [Catalog:{}, DB:{}, Table:{}, Column:{}], Reason: {}",
+            LOG.info("Failed to load stats for column [Catalog:{}, DB:{}, Table:{}, Column:{}], Reason: {}",
                     key.catalogId, key.dbId, key.tableId, key.colName, t.getMessage());
             if (LOG.isDebugEnabled()) {
                 LOG.debug(t);