(dolphinscheduler) branch dev updated: Change ssh heartbeat type to IGNORE (#15858)

[wenjun]

This is an automated email from the ASF dual-hosted git repository.

wenjun pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git


The following commit(s) were added to refs/heads/dev by this push:
     new 9437d276e7 Change ssh heartbeat type to IGNORE (#15858)
9437d276e7 is described below

commit 9437d276e76b18a2cf6c469fa886a027115ece03
Author: Wenjun Ruan <wen...@apache.org>
AuthorDate: Tue Apr 16 22:49:11 2024 +0800

    Change ssh heartbeat type to IGNORE (#15858)
---
 .../apache/dolphinscheduler/plugin/datasource/ssh/SSHUtils.java    | 2 +-
 .../dolphinscheduler/plugin/task/remoteshell/RemoteExecutor.java   | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

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
index 42e1175e2e..7abb18cee8 100644
--- 
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 class SSHUtils {
                 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
index 334ebb6195..307023043a 100644
--- 
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 class RemoteExecutor implements AutoCloseable {
             }
         }
         cleanData(taskId);
-        log.error("Remote shell task failed");
         return exitCode;
     }
 
@@ -232,8 +231,10 @@ public class RemoteExecutor implements AutoCloseable {
             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();
         }