This is an automated email from the ASF dual-hosted git repository.
dataroaring 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 55b4cf1658a [fix](load) fix NPE in LoadManager#jobRemovedTrigger()
(#36173) (#36337)
55b4cf1658a is described below
commit 55b4cf1658ab46701e68e73af7397e6fa3353a54
Author: Kaijie Chen <[email protected]>
AuthorDate: Sat Jun 15 23:06:31 2024 +0800
[fix](load) fix NPE in LoadManager#jobRemovedTrigger() (#36173) (#36337)
cherry-pick #36173
---
.../main/java/org/apache/doris/load/loadv2/LoadManager.java | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
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 f5aa1317e59..122182c65c0 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
@@ -451,15 +451,21 @@ public class LoadManager implements Writable {
}
private void jobRemovedTrigger(LoadJob job) {
- Map<String, List<LoadJob>> map =
dbIdToLabelToLoadJobs.get(job.getDbId());
- List<LoadJob> list = map.get(job.getLabel());
- list.remove(job);
if (job instanceof SparkLoadJob) {
((SparkLoadJob) job).clearSparkLauncherLog();
}
if (job instanceof BulkLoadJob) {
((BulkLoadJob) job).recycleProgress();
}
+ Map<String, List<LoadJob>> map =
dbIdToLabelToLoadJobs.get(job.getDbId());
+ if (map == null) {
+ return;
+ }
+ List<LoadJob> list = map.get(job.getLabel());
+ if (list == null) {
+ return;
+ }
+ list.remove(job);
if (list.isEmpty()) {
map.remove(job.getLabel());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
