From 563deecae0ac2690b6d8d5571bf7af09408943cd Mon Sep 17 00:00:00 2001 From: Jian Yu Date: Tue, 3 Oct 2023 13:43:11 -0700 Subject: [PATCH] LU-17152 tests: unmount NFS clients with zconf_umount_clients This patch fixes cleanup_nfs() to unmount NFS clients by running zconf_umount_clients(), which can find and kill active processes that are accessing the NFS mount point so as to avoid the "device is busy" failure. The patch also adds racer_on_nfs test into always_except list for parallel-scale-nfsv4 due to LU-17154. Test-Parameters: trivial testlist=parallel-scale-nfsv4 Change-Id: I37a38502362399540c28e78d1343e768b490ce8b Signed-off-by: Jian Yu Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/52533 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger Reviewed-by: Alex Deiter Reviewed-by: Oleg Drokin --- lustre/tests/parallel-scale-nfsv4.sh | 3 +++ lustre/tests/setup-nfs.sh | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/lustre/tests/parallel-scale-nfsv4.sh b/lustre/tests/parallel-scale-nfsv4.sh index 7ca5bd9..3d655d5 100755 --- a/lustre/tests/parallel-scale-nfsv4.sh +++ b/lustre/tests/parallel-scale-nfsv4.sh @@ -4,4 +4,7 @@ LUSTRE=${LUSTRE:-$(dirname $0)/..} . $LUSTRE/tests/test-framework.sh init_test_env "$@" +export ALWAYS_EXCEPT="$PARALLEL_SCALE_NFSV4_EXCEPT " +always_except LU-17154 racer_on_nfs + $LUSTRE/tests/parallel-scale-nfs.sh 4 diff --git a/lustre/tests/setup-nfs.sh b/lustre/tests/setup-nfs.sh index eb6720f..ea392d2 100755 --- a/lustre/tests/setup-nfs.sh +++ b/lustre/tests/setup-nfs.sh @@ -38,7 +38,7 @@ cleanup_nfs() { local EXPORTS_FILE=$DEFAULT_EXPORTS_FILE echo "Unmounting NFS clients" - do_nodes "$NFS_CLIENTS" "umount -v -f $NFS_MOUNT_POINT" || return 1 + zconf_umount_clients "$NFS_CLIENTS" $NFS_MOUNT_POINT -f || return 1 do_nodes "$NFS_CLIENTS" "systemctl stop nfs-idmapd" || return 1 echo "Unexporting Lustre filesystem" -- 1.8.3.1