Merge b33fd86 into e00121b

ruanwenjun · web-flow · commit b50d662ac2d9 · 2024-01-19T11:45:20.000Z
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/enums/Status.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/enums/Status.java
@@ -131,7 +131,7 @@ public enum Status {
     VERIFY_USERNAME_ERROR(10100, "verify username error", "用户名验证错误"),
     UNAUTHORIZED_USER_ERROR(10101, "unauthorized user error", "查询未授权用户错误"),
     AUTHORIZED_USER_ERROR(10102, "authorized user error", "查询授权用户错误"),
-    QUERY_TASK_INSTANCE_LOG_ERROR(10103, "view task instance log error", "查询任务实例日志错误"),
+    QUERY_TASK_INSTANCE_LOG_ERROR(10103, "view task instance log error: {0}", "查询任务实例日志错误: {0}"),
     DOWNLOAD_TASK_INSTANCE_LOG_FILE_ERROR(10104, "download task instance log file error", "下载任务日志文件错误"),
     CREATE_PROCESS_DEFINITION_ERROR(10105, "create process definition error", "创建工作流错误"),
     VERIFY_PROCESS_DEFINITION_NAME_UNIQUE_ERROR(10106, "verify process definition name unique error", "工作流定义名称验证错误"),
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/LoggerServiceImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/LoggerServiceImpl.java
@@ -188,6 +188,11 @@ private String queryLog(TaskInstance taskInstance, int skipLineNum, int limit) {
         final String logPath = taskInstance.getLogPath();
         log.info("Query task instance log, taskInstanceId:{}, taskInstanceName:{}, host: {}, logPath:{}",
                 taskInstance.getId(), taskInstance.getName(), taskInstance.getHost(), logPath);
+        if (StringUtils.isBlank(logPath)) {
+            throw new ServiceException(Status.QUERY_TASK_INSTANCE_LOG_ERROR,
+                    "TaskInstanceLogPath is empty, maybe the taskInstance doesn't be dispatched");
+        }
+
         StringBuilder sb = new StringBuilder();
         if (skipLineNum == 0) {
             String head = String.format(LOG_HEAD_FORMAT,
@@ -213,7 +218,7 @@ private String queryLog(TaskInstance taskInstance, int skipLineNum, int limit) {
             }
             return sb.toString();
         } catch (Throwable ex) {
-            throw new ServiceException(Status.QUERY_TASK_INSTANCE_LOG_ERROR, ex);
+            throw new ServiceException(Status.QUERY_TASK_INSTANCE_LOG_ERROR, ex.getMessage(), ex);
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -188,6 +188,11 @@ private String queryLog(TaskInstance taskInstance, int skipLineNum, int limit) {`
`188`	`188`	`final String logPath = taskInstance.getLogPath();`
`189`	`189`	`log.info("Query task instance log, taskInstanceId:{}, taskInstanceName:{}, host: {}, logPath:{}",`
`190`	`190`	`taskInstance.getId(), taskInstance.getName(), taskInstance.getHost(), logPath);`
	`191`	`+ if (StringUtils.isBlank(logPath)) {`
	`192`	`+ throw new ServiceException(Status.QUERY_TASK_INSTANCE_LOG_ERROR,`
	`193`	`+ "TaskInstanceLogPath is empty, maybe the taskInstance doesn't be dispatched");`
	`194`	`+ }`
	`195`	`+`
`191`	`196`	`StringBuilder sb = new StringBuilder();`
`192`	`197`	`if (skipLineNum == 0) {`
`193`	`198`	`String head = String.format(LOG_HEAD_FORMAT,`
`@@ -213,7 +218,7 @@ private String queryLog(TaskInstance taskInstance, int skipLineNum, int limit) {`
`213`	`218`	`}`
`214`	`219`	`return sb.toString();`
`215`	`220`	`} catch (Throwable ex) {`
`216`		`- throw new ServiceException(Status.QUERY_TASK_INSTANCE_LOG_ERROR, ex);`
	`221`	`+ throw new ServiceException(Status.QUERY_TASK_INSTANCE_LOG_ERROR, ex.getMessage(), ex);`
`217`	`222`	`}`
`218`	`223`	`}`
`219`	`224`