Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-13817 quota: print error when pool is absent
[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
..
a569908
100644
(file)
--- a/
lustre/tests/parallel-scale-cifs.sh
+++ b/
lustre/tests/parallel-scale-cifs.sh
@@
-13,11
+13,11
@@
#set -vx
#set -vx
-LUSTRE=${LUSTRE:-$(
cd $(dirname $0)/..; echo $PWD)
}
+LUSTRE=${LUSTRE:-$(
dirname $0)/..
}
. $LUSTRE/tests/test-framework.sh
init_test_env $@
. $LUSTRE/tests/test-framework.sh
init_test_env $@
-. ${CONFIG:=$LUSTRE/tests/cfg/$NAME.sh}
init_logging
init_logging
+
. $LUSTRE/tests/setup-cifs.sh
check_and_setup_lustre
. $LUSTRE/tests/setup-cifs.sh
check_and_setup_lustre
@@
-35,8
+35,7
@@
SMBCLIENTS=${SMBCLIENTS:-$CLIENTS}
SMBCLIENTS=$(exclude_items_from_list $SMBCLIENTS $LUSTRE_CLIENT_SMBSRV)
[ -z "$SMBCLIENTS" ] &&
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}
# 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))
[[ $((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 "
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 \
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
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
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"
[ $rc -eq 0 ] || error "iozone load on $clients failed! rc=$rc"
}
run_test iozone "iozone on cifs clients"