LU-4270 test: fix sanity test_209

[fs/lustre-release.git] / lustre / tests / mdsrate-create-large.sh

diff --git a/lustre/tests/mdsrate-create-large.sh b/lustre/tests/mdsrate-create-large.sh
index aa99a1c..fd10e02 100644 (file)
--- a/lustre/tests/mdsrate-create-large.sh
+++ b/lustre/tests/mdsrate-create-large.sh
@@ -13,7 +13,7 @@ MACHINEFILE=${MACHINEFILE:-$TMP/$(basename $0 .sh).machines}
 BASEDIR=$MOUNT/mdsrate
 
 # Requirements
-# set NUM_FILES=0 to force TIME_PERIOD work  
+# set NUM_FILES=0 to force TIME_PERIOD work
 NUM_FILES=${NUM_FILES:-1000000}
 TIME_PERIOD=${TIME_PERIOD:-600}                        # seconds
 
@@ -28,7 +28,7 @@ NUM_CLIENTS=$(get_node_count ${NODES_TO_USE//,/ })
 
 [ ! -x ${MDSRATE} ] && error "${MDSRATE} not built."
 
-log "===== $0 ====== " 
+log "===== $0 ====== "
 
 check_and_setup_lustre
 
@@ -55,28 +55,24 @@ else
 
     log "===== $0 ### 1 NODE CREATE ###"
 
-    COMMAND="${MDSRATE} ${MDSRATE_DEBUG} --create --time ${TIME_PERIOD}
-                --nfiles ${NUM_FILES} --dir ${TESTDIR_SINGLE} --filefmt 'f%%d'"
-    echo "+ ${COMMAND}"
-    mpi_run -np 1 -machinefile ${MACHINEFILE} ${COMMAND} | tee ${LOG}
+       COMMAND="${MDSRATE} ${MDSRATE_DEBUG} --create --time ${TIME_PERIOD}
+               --nfiles ${NUM_FILES} --dir ${TESTDIR_SINGLE} --filefmt 'f%%d'"
+       echo "+ ${COMMAND}"
+       mpi_run ${MACHINEFILE_OPTION} ${MACHINEFILE} -np 1 ${COMMAND} |
+               tee ${LOG}
 
     if [ ${PIPESTATUS[0]} != 0 ]; then
        [ -f $LOG ] && sed -e "s/^/log: /" $LOG
        error "mdsrate creates for a single client failed, aborting"
     fi
-    
-    log "===== $0 ### 1 NODE UNLINK ###"
 
-    if [ -f "$LOG" ]; then
-        CREATED=$(awk '/total:/ { print $7 }' $LOG)
-        [ $CREATED -gt 0 ] && NUM_FILES=$CREATED
-    fi
+    log "===== $0 ### 1 NODE UNLINK ###"
 
     COMMAND="${MDSRATE} ${MDSRATE_DEBUG} --unlink
                 --nfiles ${NUM_FILES} --dir ${TESTDIR_SINGLE} --filefmt 'f%%d'"
     echo "+ ${COMMAND}"
-    mpi_run -np 1 -machinefile ${MACHINEFILE} ${COMMAND} | tee ${LOG}
- 
+    mpi_run ${MACHINEFILE_OPTION} ${MACHINEFILE} -np 1 ${COMMAND} | tee ${LOG}
+
     if [ ${PIPESTATUS[0]} != 0 ]; then
        [ -f $LOG ] && sed -e "s/^/log: /" $LOG
        error "mdsrate unlink on a single client failed, aborting"
@@ -98,10 +94,11 @@ else
 
     log "===== $0 ### $NUM_CLIENTS NODES CREATE ###"
 
-    COMMAND="${MDSRATE} ${MDSRATE_DEBUG} --create --time ${TIME_PERIOD}
-                --nfiles $NUM_FILES --dir ${TESTDIR_MULTI} --filefmt 'f%%d'"
-    echo "+ ${COMMAND}"
-    mpi_run -np ${NUM_CLIENTS} -machinefile ${MACHINEFILE} ${COMMAND} | tee ${LOG}
+       COMMAND="${MDSRATE} ${MDSRATE_DEBUG} --create --time ${TIME_PERIOD}
+               --nfiles $NUM_FILES --dir ${TESTDIR_MULTI} --filefmt 'f%%d'"
+       echo "+ ${COMMAND}"
+       mpi_run ${MACHINEFILE_OPTION} ${MACHINEFILE} -np ${NUM_CLIENTS} \
+               ${COMMAND} | tee ${LOG}
 
     if [ ${PIPESTATUS[0]} != 0 ]; then
        [ -f $LOG ] && sed -e "s/^/log: /" $LOG
@@ -110,15 +107,11 @@ else
 
     log "===== $0 ### $NUM_CLIENTS NODES UNLINK ###"
 
-    if [ -f "$LOG" ]; then
-        CREATED=$(awk '/total:/ { print $7 }' $LOG)
-        [ $CREATED -gt 0 ] && NUM_FILES=$CREATED
-    fi
-
-    COMMAND="${MDSRATE} ${MDSRATE_DEBUG} --unlink
-                --nfiles ${NUM_FILES} --dir ${TESTDIR_MULTI} --filefmt 'f%%d'"
-    echo "+ ${COMMAND}"
-    mpi_run -np ${NUM_CLIENTS} -machinefile ${MACHINEFILE} ${COMMAND} | tee ${LOG}
+       COMMAND="${MDSRATE} ${MDSRATE_DEBUG} --unlink
+               --nfiles ${NUM_FILES} --dir ${TESTDIR_MULTI} --filefmt 'f%%d'"
+       echo "+ ${COMMAND}"
+       mpi_run ${MACHINEFILE_OPTION} ${MACHINEFILE} -np ${NUM_CLIENTS} \
+               ${COMMAND} | tee ${LOG}
 
     if [ ${PIPESTATUS[0]} != 0 ]; then
        [ -f $LOG ] && sed -e "s/^/log: /" $LOG