From c929f30fd103f9544ee15237f8680839664fdef7 Mon Sep 17 00:00:00 2001 From: Xing Huang Date: Thu, 27 Oct 2022 19:41:11 +0800 Subject: [PATCH] LU-10680 tests: fix interop for sanity test_160h Add a check sanity test_160h whether /sbin/umount.lustre is installed on the MDS, since this subtest is checking whether the MDS unmount process has completed, and otherwise fails during interop testing. Test-Parameters: testlist=sanity env=ONLY=160 serverversion=2.12 Fixes: 31fef6845e8b ("LU-10680 mdd: create gc thread when no current transaction") Signed-off-by: Xing Huang Change-Id: I6720b9e27a3a92e543ed877453802d23c0eef36d Reviewed-by: Andreas Dilger Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/53773 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Oleg Drokin --- lustre/tests/sanity.sh | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh index 4195903..ca0ea72 100755 --- a/lustre/tests/sanity.sh +++ b/lustre/tests/sanity.sh @@ -16522,6 +16522,12 @@ test_160h() { stop_pids[mds$i]=$! done + do_facet mds1 "ls -l /sbin/umount*" + local umount="umount.lustre" + [[ -n "$(do_facet mds1 /bin/ls /sbin/$umount 2>/dev/null)" ]] || + umount="umount" + echo "using /sbin/$umount on mds1" + for i in $(mdts_nodes); do local facet local nb=0 @@ -16541,8 +16547,9 @@ test_160h() { "R" 20 || error "$i: GC-thread not found in R-state" # check umounts of each MDT on MDS have reached kthread_stop() - [[ $(do_node $i pgrep umount | wc -l) -eq $nb ]] || - error "$i: expected $nb umount" + do_node $i "ps auxww | grep umount" + [[ $(do_node $i pgrep $umount | wc -l) -eq $nb ]] || + error "$i: expected $nb $umount" wait_update $i \ "ps -C umount -o state --no-headers | uniq" "D" 20 || error "$i: umount not found in D-state" -- 1.8.3.1