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-15626 tests: Fix "error" reported by shellcheck
[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
4eaf97a
..
d74ac32
100644
(file)
--- a/
lustre/tests/parallel-scale-cifs.sh
+++ b/
lustre/tests/parallel-scale-cifs.sh
@@
-13,17
+13,13
@@
#set -vx
#set -vx
-LUSTRE=${LUSTRE:-$(
cd $(dirname $0)/..; echo $PWD)
}
+LUSTRE=${LUSTRE:-$(
dirname $0)/..
}
. $LUSTRE/tests/test-framework.sh
. $LUSTRE/tests/test-framework.sh
-init_test_env $@
-. ${CONFIG:=$LUSTRE/tests/cfg/$NAME.sh}
+init_test_env "$@"
init_logging
init_logging
-. $LUSTRE/tests/setup-cifs.sh
-check_and_setup_lustre
+. $LUSTRE/tests/setup-cifs.sh
-# first unmount all the lustre clients
-cleanup_mount $MOUNT
# lustre client used as samba server (default is mds node)
LUSTRE_CLIENT_SMBSRV=${LUSTRE_CLIENT_SMBSRV:-$(facet_active_host $SINGLEMDS)}
SMBSHARE=${SMBSHARE:-lustretest}
# lustre client used as samba server (default is mds node)
LUSTRE_CLIENT_SMBSRV=${LUSTRE_CLIENT_SMBSRV:-$(facet_active_host $SINGLEMDS)}
SMBSHARE=${SMBSHARE:-lustretest}
@@
-37,6
+33,13
@@
SMBCLIENTS=$(exclude_items_from_list $SMBCLIENTS $LUSTRE_CLIENT_SMBSRV)
[ -z "$SMBCLIENTS" ] &&
skip_env "need at least two nodes: samba server and samba client"
[ -z "$SMBCLIENTS" ] &&
skip_env "need at least two nodes: samba server and samba client"
+do_nodes $SMBCLIENTS modinfo cifs | grep dummy > /dev/null &&
+ skip_env "OFED installation caused CIFS to break in RHEL8.4 mlnx 5.4"
+
+check_and_setup_lustre
+# first unmount all the lustre clients
+cleanup_mount $MOUNT
+
# 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}
@@
-172,6
+175,8
@@
test_fsx() {
local space=$(df -P $SMBCLIMNTPT | tail -n 1 | awk '{ print $4 }')
[ $space -lt $((size * nclients)) ] && size=$((space * 3 / 4 / nclients))
local space=$(df -P $SMBCLIMNTPT | tail -n 1 | awk '{ print $4 }')
[ $space -lt $((size * nclients)) ] && size=$((space * 3 / 4 / nclients))
+ check_set_fallocate
+
local cmd="$FSX -c 50 -p 500 -S $seed -P $TMP -l $size -N $numop "
echo "Using: $cmd"
local cmd="$FSX -c 50 -p 500 -S $seed -P $TMP -l $size -N $numop "
echo "Using: $cmd"