From: Eric Ren <z...@suse.com>
Parameter orte_rsh_agent in open MPI is deprecated. Replace with
"orte_rsh_agent" and use its default value "ssh:rsh".
Signed-off-by: Eric Ren <z...@suse.com>
Reviewed-by: He Gang <g...@suse.com>
---
programs/defrag-test/defrag-test.sh | 4 ++--
programs/discontig_bg_test/activate_discontig_bg.sh | 6 +++---
programs/discontig_bg_test/discontig_runner.sh | 6 +++---
programs/dx_dirs_tests/multi_index_dir_run.sh | 2 +-
programs/inline-data/multi-inline-run.sh | 4 ++--
programs/inode_alloc_perf_tests/multi_inode_alloc_perf.sh | 2 +-
programs/python_common/o2tf.py | 8 ++++----
programs/reflink_tests/multi_reflink_test_run.sh | 4 ++--
programs/xattr_tests/xattr-multi-run.sh | 4 ++--
9 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/programs/defrag-test/defrag-test.sh
b/programs/defrag-test/defrag-test.sh
index 0c8a2fb..8ce5180 100755
--- a/programs/defrag-test/defrag-test.sh
+++ b/programs/defrag-test/defrag-test.sh
@@ -72,7 +72,7 @@ MULTI_TEST=
MPI_HOSTS=
MPI_RANKS=
MPI_ACCESS_METHOD="rsh"
-MPI_PLS_AGENT_ARG="-mca pls_rsh_agent rsh:ssh"
+MPI_PLS_AGENT_ARG="-mca pls_rsh_agent ssh:rsh"
MPI_BTL_ARG="-mca btl tcp,self"
MPI_BTL_IF_ARG=
@@ -173,7 +173,7 @@ function f_check()
}
if [ "$MPI_ACCESS_METHOD" = "rsh" ];then
- MPI_PLS_AGENT_ARG="-mca pls_rsh_agent rsh:ssh"
+ MPI_PLS_AGENT_ARG="-mca pls_rsh_agent ssh:rsh"
else
MPI_PLS_AGENT_ARG="-mca pls_rsh_agent ssh:rsh"
fi
diff --git a/programs/discontig_bg_test/activate_discontig_bg.sh
b/programs/discontig_bg_test/activate_discontig_bg.sh
index 0bb5482..4329247 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 orte_rsh_agent rsh:ssh"
+MPI_PLS_AGENT_ARG="-mca plm_rsh_agent ssh:rsh"
MPI_BTL_ARG="-mca btl tcp,self"
MPI_BTL_IF_ARG=
################################################################################
@@ -164,9 +164,9 @@ function f_setup()
}
if [ "$MPI_ACCESS_METHOD" = "rsh" ];then
- MPI_PLS_AGENT_ARG="-mca orte_rsh_agent rsh:ssh"
+ MPI_PLS_AGENT_ARG="-mca plm_rsh_agent ssh:rsh"
else
- MPI_PLS_AGENT_ARG="-mca orte_rsh_agent ssh:rsh"
+ MPI_PLS_AGENT_ARG="-mca plm_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 9f0aeab..3ee63d1 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 orte_rsh_agent rsh:ssh"
+MPI_PLS_AGENT_ARG="-mca plm_rsh_agent ssh:rsh"
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 orte_rsh_agent rsh:ssh"
+ MPI_PLS_AGENT_ARG="-mca plm_rsh_agent ssh:rsh"
else
- MPI_PLS_AGENT_ARG="-mca orte_rsh_agent ssh:rsh"
+ MPI_PLS_AGENT_ARG="-mca plm_rsh_agent ssh:rsh"
fi
fi
diff --git a/programs/dx_dirs_tests/multi_index_dir_run.sh
b/programs/dx_dirs_tests/multi_index_dir_run.sh
index 735fc79..eb72a7d 100755
--- a/programs/dx_dirs_tests/multi_index_dir_run.sh
+++ b/programs/dx_dirs_tests/multi_index_dir_run.sh
@@ -123,7 +123,7 @@ function f_setup()
f_getoptions $*
if [ "$MPI_ACCESS_METHOD" = "rsh" ];then
- MPI_PLS_AGENT_ARG="-mca pls_rsh_agent rsh:ssh"
+ MPI_PLS_AGENT_ARG="-mca pls_rsh_agent ssh:rsh"
fi
if [ -z "${MOUNT_POINT}" ];then
diff --git a/programs/inline-data/multi-inline-run.sh
b/programs/inline-data/multi-inline-run.sh
index ba62aa6..ddd0e4f 100755
--- a/programs/inline-data/multi-inline-run.sh
+++ b/programs/inline-data/multi-inline-run.sh
@@ -64,7 +64,7 @@ declare -i MPI_RANKS
MPI_HOSTS=
MPI_HOSTFILE=
MPI_ACCESS_METHOD="ssh"
-MPI_PLS_AGENT_ARG="-mca orte_rsh_agent ssh:rsh"
+MPI_PLS_AGENT_ARG="-mca plm_rsh_agent ssh:rsh"
set -o pipefail
@@ -168,7 +168,7 @@ f_setup()
f_getoptions $*
if [ "$MPI_ACCESS_METHOD" = "rsh" ];then
- MPI_PLS_AGENT_ARG="-mca orte_rsh_agent rsh:ssh"
+ MPI_PLS_AGENT_ARG="-mca plm_rsh_agent ssh:rsh"
REMOTE_SH_BIN=${RSH_BIN}
fi
diff --git a/programs/inode_alloc_perf_tests/multi_inode_alloc_perf.sh
b/programs/inode_alloc_perf_tests/multi_inode_alloc_perf.sh
index e419961..c54e80f 100755
--- a/programs/inode_alloc_perf_tests/multi_inode_alloc_perf.sh
+++ b/programs/inode_alloc_perf_tests/multi_inode_alloc_perf.sh
@@ -196,7 +196,7 @@ function f_check()
f_getoptions $*
if [ "$MPI_ACCESS_METHOD" = "rsh" ];then
- MPI_PLS_AGENT_ARG="-mca pls_rsh_agent rsh:ssh"
+ MPI_PLS_AGENT_ARG="-mca pls_rsh_agent ssh:rsh"
fi
if [ -z "${MOUNT_POINT}" ];then
diff --git a/programs/python_common/o2tf.py b/programs/python_common/o2tf.py
index 4da4172..b9b88a9 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 orte_rsh_agent ssh:rsh'
+ shopt = '-mca plm_rsh_agent ssh:rsh'
else:
- shopt = '-mca orte_rsh_agent rsh:ssh'
+ shopt = '-mca plm_rsh_agent ssh:rsh'
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 orte_rsh_agent ssh:rsh'
+ shopt = '-mca plm_rsh_agent ssh:rsh'
else:
- shopt = '-mca orte_rsh_agent rsh:ssh'
+ shopt = '-mca plm_rsh_agent ssh:rsh'
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 03cea3c..49875b8 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 orte_rsh_agent ssh:rsh"
+MPI_PLS_AGENT_ARG="-mca plm_rsh_agent ssh:rsh"
MPI_BTL_ARG="-mca btl tcp,self"
MPI_BTL_IF_ARG=
@@ -140,7 +140,7 @@ function f_setup()
f_getoptions $*
if [ "$MPI_ACCESS_METHOD" = "rsh" ];then
- MPI_PLS_AGENT_ARG="-mca pls_rsh_agent rsh:ssh"
+ MPI_PLS_AGENT_ARG="-mca pls_rsh_agent ssh:rsh"
fi
if [ -z "${MOUNT_POINT}" ];then
diff --git a/programs/xattr_tests/xattr-multi-run.sh
b/programs/xattr_tests/xattr-multi-run.sh
index 98ef0ff..0d49072 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 orte_rsh_agent ssh:rsh"
+MPI_PLS_AGENT_ARG="-mca plm_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 orte_rsh_agent rsh:ssh"
+ MPI_PLS_AGENT_ARG="-mca plm_rsh_agent ssh:rsh"
REMOTE_SH_BIN=${RSH_BIN}
fi
--
2.1.4
_______________________________________________
Ocfs2-users mailing list
Ocfs2-users@oss.oracle.com
https://oss.oracle.com/mailman/listinfo/ocfs2-users
