This is an automated email from the ASF dual-hosted git repository.
kxiao pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.0 by this push:
new 36f33749f48 [Fix](show-load)Show load npe(userinfo is null) (#27698)
(#27719)
36f33749f48 is described below
commit 36f33749f480d558bd2f555aada311ffff905943
Author: Calvin Kirs <[email protected]>
AuthorDate: Tue Nov 28 23:29:28 2023 +0800
[Fix](show-load)Show load npe(userinfo is null) (#27698) (#27719)
---
.../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 2c70883d8f1..2e3b0e6e868 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
@@ -819,8 +819,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 3f05e2c5a98..dc02a0cf145 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
@@ -568,8 +568,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: [email protected]
For additional commands, e-mail: [email protected]
