(doris) branch master updated: [Fix](show-load)Show load npe(userinfo is null) (#27698)

[kxiao]

This is an automated email from the ASF dual-hosted git repository.

kxiao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git


The following commit(s) were added to refs/heads/master by this push:
     new c6f43e42416 [Fix](show-load)Show load npe(userinfo is null) (#27698)
c6f43e42416 is described below

commit c6f43e42416b536304eeeecf863438fe50b01000
Author: Calvin Kirs <acm_mas...@163.com>
AuthorDate: Tue Nov 28 21:07:32 2023 +0800

    [Fix](show-load)Show load npe(userinfo is null) (#27698)
---
 .../src/main/java/org/apache/doris/load/loadv2/LoadJob.java       | 8 ++++++--
 .../src/main/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 bd8d09d5c60..946d116b516 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 abstract class LoadJob extends 
AbstractTxnStateChangeCallback implements
             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 3eacb9f66c4..cf2a408ac79 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 class LoadManager implements Writable {
                     }
                     // 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;


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org