From 7044e566c45cfbe8ba1193ea7f9d5536d1585adb Mon Sep 17 00:00:00 2001
From: jiangxinglei <jiangxinglei@360.cn>
Date: Fri, 7 Jun 2024 14:11:19 +0800
Subject: [PATCH] use /bin/true for rsh_agent to aviod extra output

---
 core/src/main/java/net/qihoo/hbox/AM/ApplicationMaster.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/net/qihoo/hbox/AM/ApplicationMaster.java b/core/src/main/java/net/qihoo/hbox/AM/ApplicationMaster.java
index a51c7cc..79a8230 100644
--- a/core/src/main/java/net/qihoo/hbox/AM/ApplicationMaster.java
+++ b/core/src/main/java/net/qihoo/hbox/AM/ApplicationMaster.java
@@ -1669,8 +1669,8 @@ private void launchMpiExec() throws IOException {
         // MPI related options
         // bind-to none option
         envLists.add("OMPI_MCA_hwloc_base_binding_policy=none");
-        // -mca plm_rsh_agent /bin/echo
-        envLists.add("OMPI_MCA_plm_rsh_agent=/bin/echo");
+        // -mca plm_rsh_agent /bin/true
+        envLists.add("OMPI_MCA_plm_rsh_agent=/bin/true");
         // -mca plm_base_verbose 1
         envLists.add("OMPI_MCA_plm_base_verbose=1");
         // --oversubscribe
@@ -1744,7 +1744,7 @@ public void run() {
      * @return
      */
     private void processMpiExecOutput(String mpiExecOutput) {
-        if (mpiExecOutput.startsWith("command") || mpiExecOutput.contains("<template>")) {
+        if (mpiContainerCommand == null && (mpiExecOutput.startsWith("command") || mpiExecOutput.contains("<template>"))) {
             LOG.info("Container mpi Command " + mpiExecOutput);
             appendMessage(new Message(LogType.STDERR, mpiExecOutput));
             if (mpiExecOutput.startsWith("command")) {