From 44d6ea18bdf31989020e28b76aacb141c0de63eb Mon Sep 17 00:00:00 2001 From: Calvin Kirs Date: Tue, 28 Nov 2023 16:57:49 +0800 Subject: [PATCH] [Fix](show-load)Show load npe(userinfo is null) --- .../main/java/org/apache/doris/load/loadv2/LoadJob.java | 8 ++++++-- .../java/org/apache/doris/load/loadv2/LoadManager.java | 5 +++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/LoadJob.java b/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/LoadJob.java index bd8d09d5c608ee..946d116b516b77 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/LoadJob.java +++ b/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/LoadJob.java @@ -826,8 +826,12 @@ public List getShowInfo() throws DdlException { jobInfo.add(transactionId); // error tablets jobInfo.add(errorTabletsToJson()); - // user - jobInfo.add(userInfo.getQualifiedUser()); + // user, some load job may not have user info + if (userInfo == null || userInfo.getQualifiedUser() == null) { + jobInfo.add(FeConstants.null_string); + } else { + jobInfo.add(userInfo.getQualifiedUser()); + } // comment jobInfo.add(comment); return jobInfo; diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/LoadManager.java b/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/LoadManager.java index 3eacb9f66c492e..cf2a408ac7963b 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/LoadManager.java +++ b/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/LoadManager.java @@ -572,8 +572,9 @@ public List> getLoadJobInfosByDb(long dbId, String labelValue, } // add load job info loadJobInfos.add(loadJob.getShowInfo()); - } catch (DdlException e) { - continue; + } catch (RuntimeException | DdlException e) { + // ignore this load job + LOG.warn("get load job info failed. job id: {}", loadJob.getId(), e); } } return loadJobInfos;