[Ocfs2-test-devel] [PATCH 08/59] ocfs2-test: update openmpi mca parameter

[Junxiao Bi]

From: Tiger Yang <tiger.yang at oracle.com>

Since mca parameter plm_rsh_agent become deprecated in new openmpi,
new parameter orte_rsh_agent was introduced.

Signed-off-by: Tiger Yang <tiger.yang at oracle.com>
Signed-off-by: Junxiao Bi <junxiao.bi at oracle.com>
---
 .../discontig_bg_test/activate_discontig_bg.sh     |    6 +++---
 programs/discontig_bg_test/discontig_runner.sh     |    6 +++---
 programs/inline-data/multi-inline-run.sh           |    4 ++--
 programs/python_common/o2tf.py                     |    8 ++++----
 programs/reflink_tests/multi_reflink_test_run.sh   |    2 +-
 programs/xattr_tests/xattr-multi-run.sh            |    4 ++--
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/programs/discontig_bg_test/activate_discontig_bg.sh b/programs/discontig_bg_test/activate_discontig_bg.sh
index 2a03562..a7d9d12 100755
--- a/programs/discontig_bg_test/activate_discontig_bg.sh
+++ b/programs/discontig_bg_test/activate_discontig_bg.sh
@@ -59,7 +59,7 @@ MULTI_TEST=
 MPI_HOSTS=
 MPI_RANKS=
 MPI_ACCESS_METHOD="rsh"
-MPI_PLS_AGENT_ARG="-mca plm_rsh_agent rsh:ssh"
+MPI_PLS_AGENT_ARG="-mca orte_rsh_agent rsh:ssh"
 MPI_BTL_ARG="-mca btl tcp,self"
 MPI_BTL_IF_ARG=
 ################################################################################
@@ -160,9 +160,9 @@ function f_setup()
 			}
 
 			if [ "$MPI_ACCESS_METHOD" = "rsh" ];then
-				MPI_PLS_AGENT_ARG="-mca plm_rsh_agent rsh:ssh"
+				MPI_PLS_AGENT_ARG="-mca orte_rsh_agent rsh:ssh"
 			else
-				MPI_PLS_AGENT_ARG="-mca plm_rsh_agent ssh:rsh"
+				MPI_PLS_AGENT_ARG="-mca orte_rsh_agent ssh:rsh"
 				
 			fi
 		fi
diff --git a/programs/discontig_bg_test/discontig_runner.sh b/programs/discontig_bg_test/discontig_runner.sh
index 03617ca..ae50ad5 100755
--- a/programs/discontig_bg_test/discontig_runner.sh
+++ b/programs/discontig_bg_test/discontig_runner.sh
@@ -56,7 +56,7 @@ MULTI_TEST=
 MPI_HOSTS=
 MPI_RANKS=
 MPI_ACCESS_METHOD="rsh"
-MPI_PLS_AGENT_ARG="-mca plm_rsh_agent rsh:ssh"
+MPI_PLS_AGENT_ARG="-mca orte_rsh_agent rsh:ssh"
 MPI_BTL_ARG="-mca btl tcp,self"
 MPI_BTL_IF_ARG=
 ################################################################################
@@ -138,9 +138,9 @@ function f_setup()
 			}
 
 			if [ "$MPI_ACCESS_METHOD" = "rsh" ];then
-				MPI_PLS_AGENT_ARG="-mca plm_rsh_agent rsh:ssh"
+				MPI_PLS_AGENT_ARG="-mca orte_rsh_agent rsh:ssh"
 			else
-				MPI_PLS_AGENT_ARG="-mca plm_rsh_agent ssh:rsh"
+				MPI_PLS_AGENT_ARG="-mca orte_rsh_agent ssh:rsh"
 			fi
 		fi
 
diff --git a/programs/inline-data/multi-inline-run.sh b/programs/inline-data/multi-inline-run.sh
index 0129d46..eb5a16c 100755
--- a/programs/inline-data/multi-inline-run.sh
+++ b/programs/inline-data/multi-inline-run.sh
@@ -63,7 +63,7 @@ declare -i MPI_RANKS
 MPI_HOSTS=
 MPI_HOSTFILE=
 MPI_ACCESS_METHOD="ssh"
-MPI_PLS_AGENT_ARG="-mca plm_rsh_agent ssh:rsh"
+MPI_PLS_AGENT_ARG="-mca orte_rsh_agent ssh:rsh"
 
 set -o pipefail
 
@@ -167,7 +167,7 @@ f_setup()
         f_getoptions $*
 
 	if [ "$MPI_ACCESS_METHOD" = "rsh" ];then
-                MPI_PLS_AGENT_ARG="-mca plm_rsh_agent rsh:ssh"
+                MPI_PLS_AGENT_ARG="-mca orte_rsh_agent rsh:ssh"
                 REMOTE_SH_BIN=${RSH_BIN}
         fi
 
diff --git a/programs/python_common/o2tf.py b/programs/python_common/o2tf.py
index 69081bf..4da4172 100644
--- a/programs/python_common/o2tf.py
+++ b/programs/python_common/o2tf.py
@@ -220,9 +220,9 @@ so just do a sanity check here to test if all nodes are available.
 	nodelen = len(nodelist)
 
 	if remote_sh == '' or remote_sh == 'ssh':
-		shopt = '-mca plm_rsh_agent ssh:rsh'
+		shopt = '-mca orte_rsh_agent ssh:rsh'
 	else:
-		shopt = '-mca plm_rsh_agent rsh:ssh'
+		shopt = '-mca orte_rsh_agent rsh:ssh'
 
 	fd = open(config.MPIHOSTS,'w',0)
 	for i in range(nodelen):
@@ -265,9 +265,9 @@ def openmpi_run(DEBUGON, nproc, cmd, nodes, remote_sh, interface, logfile, w_fla
 		iface = '-mca btl_tcp_if_include '+interface
 
 	if remote_sh == '' or remote_sh == 'ssh':
-		shopt = '-mca plm_rsh_agent ssh:rsh'
+		shopt = '-mca orte_rsh_agent ssh:rsh'
 	else:
-		shopt = '-mca plm_rsh_agent rsh:ssh'
+		shopt = '-mca orte_rsh_agent rsh:ssh'
 	try:
 		if DEBUGON:
 			printlog('o2tf.mpi_run: MPIRUN = %s' % config.MPIRUN,
diff --git a/programs/reflink_tests/multi_reflink_test_run.sh b/programs/reflink_tests/multi_reflink_test_run.sh
index dae3143..03cea3c 100755
--- a/programs/reflink_tests/multi_reflink_test_run.sh
+++ b/programs/reflink_tests/multi_reflink_test_run.sh
@@ -75,7 +75,7 @@ DEFAULT_RANKS=4
 MPI_RANKS=
 MPI_HOSTS=
 MPI_ACCESS_METHOD="ssh"
-MPI_PLS_AGENT_ARG="-mca plm_rsh_agent ssh:rsh"
+MPI_PLS_AGENT_ARG="-mca orte_rsh_agent ssh:rsh"
 MPI_BTL_ARG="-mca btl tcp,self"
 MPI_BTL_IF_ARG=
 
diff --git a/programs/xattr_tests/xattr-multi-run.sh b/programs/xattr_tests/xattr-multi-run.sh
index e2e3c4f..98ef0ff 100755
--- a/programs/xattr_tests/xattr-multi-run.sh
+++ b/programs/xattr_tests/xattr-multi-run.sh
@@ -84,7 +84,7 @@ DEFAULT_RANKS=4
 declare -i MPI_RANKS
 MPI_HOSTS=
 MPI_ACCESS_METHOD="ssh"
-MPI_PLS_AGENT_ARG="-mca plm_rsh_agent ssh:rsh"
+MPI_PLS_AGENT_ARG="-mca orte_rsh_agent ssh:rsh"
 MPI_MCA_BTL="-mca btl tcp,self"
 MPI_MCA_BTL_IF=""
 
@@ -191,7 +191,7 @@ f_setup()
 	f_getoptions $*
 	
 	if [ "$MPI_ACCESS_METHOD" = "rsh" ];then
-		MPI_PLS_AGENT_ARG="-mca plm_rsh_agent rsh:ssh"
+		MPI_PLS_AGENT_ARG="-mca orte_rsh_agent rsh:ssh"
 		REMOTE_SH_BIN=${RSH_BIN}
 	fi
 
-- 
1.7.9.5