[Fix] Fix view job log error (#248) (#249)

datavane · Oct 18, 2023 · 1367c82 · 1367c82
1 parent babdbd7
commit 1367c82
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/datavines-core/src/main/java/io/datavines/core/enums/Status.java b/datavines-core/src/main/java/io/datavines/core/enums/Status.java
@@ -68,6 +68,8 @@ public enum Status {
     TASK_LOG_PATH_NOT_EXIST_ERROR(13010002, "Task {0} Log Path  Not Exist Error", "任务 {0} 的日志路径不存在错误"),
     TASK_EXECUTE_HOST_NOT_EXIST_ERROR(13010003, "Task Execute Host {0} Not Exist Error", "任务 {0} 的执行服务地址不存在错误"),
 
+    TASK_EXECUTE_NOT_RUNNING(13010004, "Taskt {0} has not running", "任务 {0} 还没有开始运行，请稍后重试"),
+
     JOB_PARAMETER_IS_NULL_ERROR(14010001, "Job {0} Parameter is Null Error", "作业 {0} 参数为空错误"),
     CREATE_JOB_ERROR(14010002, "Create Job {0} Error", "创建作业 {0} 错误"),
     JOB_NOT_EXIST_ERROR(14010003, "Job {0} Not Exist Error", "作业 {0} 不存在错误"),

diff --git a/...er/src/main/java/io/datavines/server/repository/service/impl/JobExecutionServiceImpl.java b/...er/src/main/java/io/datavines/server/repository/service/impl/JobExecutionServiceImpl.java
@@ -264,6 +264,9 @@ public String getJobExecutionHost(Long jobExecutionId) {
         if(null == jobExecution){
             throw new DataVinesServerException(Status.TASK_NOT_EXIST_ERROR, jobExecutionId);
         }
+        if(jobExecution.getStatus() == ExecutionStatus.SUBMITTED_SUCCESS){
+            throw new DataVinesServerException(Status.TASK_EXECUTE_NOT_RUNNING, jobExecutionId);
+        }
         String executeHost = jobExecution.getExecuteHost();
         if(StringUtils.isEmpty(executeHost)){
             throw new DataVinesServerException(Status.TASK_EXECUTE_HOST_NOT_EXIST_ERROR, jobExecutionId);