[bugfix][zeta] Fix the issue of two identical IDs appearing when exec…

…uting seatunnel.sh -l as the job resumes (apache#5191)
liunaijie · Aug 12, 2023 · adb291c · adb291c
1 parent c2f4d6e
commit adb291c
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/...ine-server/src/main/java/org/apache/seatunnel/engine/server/master/JobHistoryService.java b/...ine-server/src/main/java/org/apache/seatunnel/engine/server/master/JobHistoryService.java
@@ -42,7 +42,9 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 public class JobHistoryService {
@@ -101,10 +103,15 @@ public JobHistoryService(
     // Gets the status of a running and completed job
     public String listAllJob() {
         List<JobStatusData> status = new ArrayList<>();
+        Set<Long> runningJonIds =
+                runningJobMasterMap.values().stream()
+                        .map(master -> master.getJobImmutableInformation().getJobId())
+                        .collect(Collectors.toSet());
         Stream.concat(
                         runningJobMasterMap.values().stream()
                                 .map(master -> toJobStateMapper(master, true)),
-                        finishedJobStateImap.values().stream())
+                        finishedJobStateImap.values().stream()
+                                .filter(jobState -> !runningJonIds.contains(jobState.getJobId())))
                 .forEach(
                         jobState -> {
                             JobStatusData jobStatusData =