Merge 4386a44 into ead5453

ruanwenjun · web-flow · commit c8fcfbbe8411 · 2024-04-16T09:31:30.000Z
diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-ssh/src/main/java/org/apache/dolphinscheduler/plugin/datasource/ssh/SSHUtils.java b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-ssh/src/main/java/org/apache/dolphinscheduler/plugin/datasource/ssh/SSHUtils.java
@@ -59,7 +59,7 @@ public static ClientSession getSession(SshClient client, SSHConnectionParam conn
                 throw new Exception("Failed to add public key identity", e);
             }
         }
-        session.setSessionHeartbeat(SessionHeartbeatController.HeartbeatType.RESERVED, Duration.ofSeconds(3));
+        session.setSessionHeartbeat(SessionHeartbeatController.HeartbeatType.IGNORE, Duration.ofSeconds(3));
         return session;
     }
 }
diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-remoteshell/src/main/java/org/apache/dolphinscheduler/plugin/task/remoteshell/RemoteExecutor.java b/dolphinscheduler-task-plugin/dolphinscheduler-task-remoteshell/src/main/java/org/apache/dolphinscheduler/plugin/task/remoteshell/RemoteExecutor.java
@@ -141,7 +141,6 @@ public Integer getTaskExitCode(String taskId) throws IOException {
             }
         }
         cleanData(taskId);
-        log.error("Remote shell task failed");
         return exitCode;
     }
 
@@ -232,8 +231,10 @@ public String runRemote(String command) throws IOException {
             channel.open();
             channel.waitFor(EnumSet.of(ClientChannelEvent.CLOSED), 0);
             channel.close();
-            if (channel.getExitStatus() != 0) {
-                throw new TaskException("Remote shell task error, error message: " + err.toString());
+            Integer exitStatus = channel.getExitStatus();
+            if (exitStatus == null || exitStatus != 0) {
+                throw new TaskException(
+                        "Remote shell task error, exitStatus: " + exitStatus + " error message: " + err);
             }
             return out.toString();
         }

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ public static ClientSession getSession(SshClient client, SSHConnectionParam conn`
`59`	`59`	`throw new Exception("Failed to add public key identity", e);`
`60`	`60`	`}`
`61`	`61`	`}`
`62`		`- session.setSessionHeartbeat(SessionHeartbeatController.HeartbeatType.RESERVED, Duration.ofSeconds(3));`
	`62`	`+ session.setSessionHeartbeat(SessionHeartbeatController.HeartbeatType.IGNORE, Duration.ofSeconds(3));`
`63`	`63`	`return session;`
`64`	`64`	`}`
`65`	`65`	`}`
Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,6 @@ public Integer getTaskExitCode(String taskId) throws IOException {`
`141`	`141`	`}`
`142`	`142`	`}`
`143`	`143`	`cleanData(taskId);`
`144`		`- log.error("Remote shell task failed");`
`145`	`144`	`return exitCode;`
`146`	`145`	`}`
`147`	`146`
`@@ -232,8 +231,10 @@ public String runRemote(String command) throws IOException {`
`232`	`231`	`channel.open();`
`233`	`232`	`channel.waitFor(EnumSet.of(ClientChannelEvent.CLOSED), 0);`
`234`	`233`	`channel.close();`
`235`		`- if (channel.getExitStatus() != 0) {`
`236`		`- throw new TaskException("Remote shell task error, error message: " + err.toString());`
	`234`	`+ Integer exitStatus = channel.getExitStatus();`
	`235`	`+ if (exitStatus == null \|\| exitStatus != 0) {`
	`236`	`+ throw new TaskException(`
	`237`	`+ "Remote shell task error, exitStatus: " + exitStatus + " error message: " + err);`
`237`	`238`	`}`
`238`	`239`	`return out.toString();`
`239`	`240`	`}`