From bcf7a8b87041f9a706dcc89f2ec86b05951e74ce Mon Sep 17 00:00:00 2001
From: grev <grev>
Date: Fri, 7 Mar 2008 23:28:44 +0000
Subject: [PATCH] b=12942 i=Brian test_5a fix: check /proc/mounts instead of
mtab
---
lustre/tests/conf-sanity.sh | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index 469ce7557d..3d9b26fad5 100644
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -229,6 +229,8 @@ run_test 4 "force cleanup ost, then cleanup"
test_5a() { # was test_5
setup
touch $DIR/$tfile || return 1
+ fuser -m -v $MOUNT && echo "$MOUNT is in use by user space process."
+
stop_mds -f || return 2
# cleanup may return an error from the failed
@@ -241,8 +243,8 @@ test_5a() { # was test_5
kill -TERM $UMOUNT_PID
echo "waiting for umount to finish"
wait $UMOUNT_PID
- if grep " $MOUNT " /etc/mtab; then
- echo "test 5: mtab after failed umount"
+ if grep " $MOUNT " /proc/mounts; then
+ echo "test 5: /proc/mounts after failed umount"
umount $MOUNT &
UMOUNT_PID=$!
sleep 2
@@ -250,7 +252,7 @@ test_5a() { # was test_5
kill -TERM $UMOUNT_PID
echo "waiting for umount to finish"
wait $UMOUNT_PID
- grep " $MOUNT " /etc/mtab && echo "test 5: mtab after second umount" && return 11
+ grep " $MOUNT " /proc/mounts && echo "test 5: /proc/mounts after second umount" && return 11
fi
manual_umount_client
--
GitLab