[Ocfs2-test-devel] [PATCH 2/2] Ocfs2-test: Update mutli_reflink_test_run.sh to fix several minor issues.

[Tristan Ye]

One to use host number as the default slot number for mkfs.ocfs2, the other
try to use plm_rsh_agent instead of pls_rsh_agent to let 1.3.2 or later mpirun
work.

Signed-off-by: Tristan Ye <tristan.ye at oracle.com>
---
 programs/reflink_tests/multi_reflink_test_run.sh |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/programs/reflink_tests/multi_reflink_test_run.sh b/programs/reflink_tests/multi_reflink_test_run.sh
index f389172..91ac45a 100755
--- a/programs/reflink_tests/multi_reflink_test_run.sh
+++ b/programs/reflink_tests/multi_reflink_test_run.sh
@@ -53,7 +53,7 @@ fi
 
 BLOCKSIZE=
 CLUSTERSIZE=
-SLOTS=4
+SLOTS=
 JOURNALSIZE=0
 BLOCKS=0
 DEVICE=
@@ -74,7 +74,7 @@ DEFAULT_RANKS=4
 MPI_RANKS=
 MPI_HOSTS=
 MPI_ACCESS_METHOD="ssh"
-MPI_PLS_AGENT_ARG="-mca pls_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=
 
@@ -135,7 +135,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 plm_rsh_agent rsh:ssh"
 	fi
 
 	if [ -z "${MOUNT_POINT}" ];then
@@ -159,6 +159,12 @@ ${MOUNT_POINT}`"
 		f_usage
 	fi
 
+	if [ -z "${SLOTS}" ];then
+		echo $MPI_HOSTS|sed -e 's/,/\n/g' >/tmp/$$
+		SLOTS=`cat /tmp/$$ |wc -l`
+		rm -f /tmp/$$
+	fi
+
 	MPI_RANKS=${MPI_RANKS:-$DEFAULT_RANKS}
 
 	LOG_DIR=${LOG_DIR:-$DEFAULT_LOG_DIR}
-- 
1.5.5