Merge branch 'dev-1.21.0' into dev-1.21.0-hadoop3

zqburde · zqburde · commit f243df07f4d9 · 2026-04-16T17:23:34.000+08:00
diff --git a/plugins/azkaban/linkis-jobtype/src/main/java/com/webank/wedatasphere/dss/plugins/azkaban/linkis/jobtype/AzkabanDssJobType.java b/plugins/azkaban/linkis-jobtype/src/main/java/com/webank/wedatasphere/dss/plugins/azkaban/linkis/jobtype/AzkabanDssJobType.java
@@ -107,7 +107,7 @@ public void run() throws Exception {
             String endLog = LinkisNodeExecutionImpl.getLinkisNodeExecution().getLog(this.job);
             info(endLog);
         } catch (Throwable e){
-            info("Failed to get log", e);
+            info("Skip fetching end log because no final log content is available from Linkis.");
         }
 
         LinkisExecutionListener listener = (LinkisExecutionListener)LinkisNodeExecutionImpl.getLinkisNodeExecution();

Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ public void run() throws Exception {`
`107`	`107`	`String endLog = LinkisNodeExecutionImpl.getLinkisNodeExecution().getLog(this.job);`
`108`	`108`	`info(endLog);`
`109`	`109`	`} catch (Throwable e){`
`110`		`- info("Failed to get log", e);`
	`110`	`+ info("Skip fetching end log because no final log content is available from Linkis.");`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`LinkisExecutionListener listener = (LinkisExecutionListener)LinkisNodeExecutionImpl.getLinkisNodeExecution();`