X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Fparallel-scale-cifs.sh;h=d74ac32236712a45888fe86316cc97e419f117c1;hb=8e563553c0a26f0d8e8caf2a44b44a7f552531e9;hp=9e99d80ad1444450bd3c56b353abd8fd285f4f0d;hpb=91a2331f5db11c394b63791fee741e624e413bd1;p=fs%2Flustre-release.git

diff --git a/lustre/tests/parallel-scale-cifs.sh b/lustre/tests/parallel-scale-cifs.sh
index 9e99d80..d74ac32 100644
--- a/lustre/tests/parallel-scale-cifs.sh
+++ b/lustre/tests/parallel-scale-cifs.sh
@@ -13,17 +13,13 @@
 
 #set -vx
 
-LUSTRE=${LUSTRE:-$(cd $(dirname $0)/..; echo $PWD)}
+LUSTRE=${LUSTRE:-$(dirname $0)/..}
 . $LUSTRE/tests/test-framework.sh
-init_test_env $@
-. ${CONFIG:=$LUSTRE/tests/cfg/$NAME.sh}
+init_test_env "$@"
 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}
@@ -35,8 +31,14 @@ 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"
+
+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}
@@ -173,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))
 
+	check_set_fallocate
+
 	local cmd="$FSX -c 50 -p 500 -S $seed -P $TMP -l $size -N $numop "
 
 	echo "Using: $cmd"