LU-12472 tests: update sanity-krb5.sh

[fs/lustre-release.git] / lustre / tests / parallel-scale-cifs.sh

diff --git a/lustre/tests/parallel-scale-cifs.sh b/lustre/tests/parallel-scale-cifs.sh
index b47e043..4eaf97a 100644 (file)
--- a/lustre/tests/parallel-scale-cifs.sh
+++ b/lustre/tests/parallel-scale-cifs.sh
@@ -35,8 +35,7 @@ SMBCLIENTS=${SMBCLIENTS:-$CLIENTS}
 SMBCLIENTS=$(exclude_items_from_list $SMBCLIENTS $LUSTRE_CLIENT_SMBSRV)
 
 [ -z "$SMBCLIENTS" ] &&
-       skip_env "need at least two nodes: samba server and samba client" &&
-       exit 0
+       skip_env "need at least two nodes: samba server and samba client"
 
 # set CONFIGURE_SMB=false to skip smb config
 CONFIGURE_SMB=${CONFIGURE_SMB:-true}
@@ -211,6 +210,9 @@ test_iozone() {
        [[ $((size * nclients)) -gt $((space * 3 / 4)) ]] &&
                size=$((space * 3 / 4 / nclients))
 
+       do_node $LUSTRE_CLIENT_SMBSRV "mkdir $SMBSRVMNTPT/$tdir
+               lfs setstripe -c -1 $SMBSRVMNTPT/$tdir"
+
        log "free space: $space Kb, using $size size, $nclients number of clients"
 
        local cmd="iozone -a -e -+d -s $size "
@@ -219,8 +221,8 @@ test_iozone() {
 
        do_nodesv $clients "set -x; \
                PATH=\$PATH \
-               $cmd -f $SMBCLIMNTPT/f0.iozone_\\\$(hostname) 2>&1 | tee $log; \
-               exit \\\${PIPESTATUS[0]}" &
+               $cmd -f $SMBCLIMNTPT/$tdir/f0.iozone_\\\$(hostname) \
+               2>&1 | tee $log; exit \\\${PIPESTATUS[0]}" &
        pid=$!
 
        # check that iozone is started on all clients after
@@ -237,6 +239,7 @@ test_iozone() {
        rc=$?
        log "Processing iozone log"
        do_nodesv $clients "tail -1 $log | grep -q complete" || rc=2
+       do_node $LUSTRE_CLIENT_SMBSRV "rm -rf $SMBSRVMNTPT/$tdir"
        [ $rc -eq 0 ] || error "iozone load on $clients failed! rc=$rc"
 }
 run_test iozone "iozone on cifs clients"