Fix jobhistory bug (DataLinkDC#805)

* jobHistory bug modify * jobHistory bug modify * jobHistory bug modify
skdfeitian · Aug 3, 2022 · bd3fdd8 · bd3fdd8
1 parent ed6e851
commit bd3fdd8
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/dlink-admin/src/main/java/com/dlink/model/JobHistory.java b/dlink-admin/src/main/java/com/dlink/model/JobHistory.java
@@ -87,4 +87,7 @@ public class JobHistory implements Serializable {
 
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private LocalDateTime updateTime;
+
+    @TableField(exist = false)
+    private boolean error;
 }
diff --git a/dlink-admin/src/main/java/com/dlink/service/impl/JobHistoryServiceImpl.java b/dlink-admin/src/main/java/com/dlink/service/impl/JobHistoryServiceImpl.java
@@ -95,7 +95,11 @@ public JobHistory refreshJobHistory(Integer id, String jobManagerHost, String jo
             JsonNode jobInfo = FlinkAPI.build(jobManagerHost).getJobInfo(jobId);
             if(jobInfo.has(FlinkRestResultConstant.ERRORS)){
                 final JobHistory dbHistory = getById(id);
-                return Objects.isNull(dbHistory) ? jobHistory : dbHistory;
+                if (Objects.nonNull(dbHistory)) {
+                    jobHistory = dbHistory;
+                }
+                jobHistory.setError(true);
+                return jobHistory;
             }
             JsonNode exception = FlinkAPI.build(jobManagerHost).getException(jobId);
             JsonNode checkPoints = FlinkAPI.build(jobManagerHost).getCheckPoints(jobId);
@@ -115,8 +119,7 @@ public JobHistory refreshJobHistory(Integer id, String jobManagerHost, String jo
             }
         } catch (Exception e) {
             e.printStackTrace();
-        } finally {
-            return jobHistory;
         }
+        return jobHistory;
     }
 }
diff --git a/dlink-admin/src/main/java/com/dlink/service/impl/TaskServiceImpl.java b/dlink-admin/src/main/java/com/dlink/service/impl/TaskServiceImpl.java
@@ -785,13 +785,13 @@ public JobInstance refreshJobInstance(Integer id, boolean isCoercive) {
         }
         JobHistory jobHistoryJson = jobHistoryService.refreshJobHistory(id, jobInfoDetail.getCluster().getJobManagerHost(), jobInfoDetail.getInstance().getJid(), jobInfoDetail.isNeedSave());
         JobHistory jobHistory = jobHistoryService.getJobHistoryInfo(jobHistoryJson);
-        if (JobStatus.isDone(jobInfoDetail.getInstance().getStatus()) && Asserts.isNull(jobHistory.getJob())) {
+        jobInfoDetail.setJobHistory(jobHistory);
+        if (JobStatus.isDone(jobInfoDetail.getInstance().getStatus()) && (Asserts.isNull(jobHistory.getJob()) || jobHistory.isError())) {
             return jobInfoDetail.getInstance();
         }
-        jobInfoDetail.setJobHistory(jobHistory);
         String status = jobInfoDetail.getInstance().getStatus();
         boolean jobStatusChanged = false;
-        if (Asserts.isNull(jobInfoDetail.getJobHistory().getJob())) {
+        if (Asserts.isNull(jobInfoDetail.getJobHistory().getJob()) || jobInfoDetail.getJobHistory().isError()) {
             jobInfoDetail.getInstance().setStatus(JobStatus.UNKNOWN.getValue());
         } else {
             jobInfoDetail.getInstance().setDuration(jobInfoDetail.getJobHistory().getJob().get(FlinkRestResultConstant.JOB_DURATION).asLong() / 1000);