LU-4416 tests: small fixes for conf_sanity

--In util-linux 2.23.2, umount will call stat() on
  mountpoint. So have to use 'umount -f' in test_5a.
  Else the test will block forever.
--Invoke cleanup_fs2 in test_24b.

Signed-off-by: Yang Sheng <yang.sheng@intel.com>
Change-Id: Ie7540d6cfd6790417c63ea1efb50381cacc8345f
Reviewed-on: http://review.whamcloud.com/10783
Reviewed-by: Bob Glossman <bob.glossman@intel.com>
Tested-by: Jenkins
Reviewed-by: James Simmons <uja.ornl@gmail.com>
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>

diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index c4d2136..edaf102 100644 (file)
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -364,7 +364,7 @@ test_5a() { # was test_5
        wait $UMOUNT_PID
        if grep " $MOUNT " /proc/mounts; then
                echo "test 5: /proc/mounts after failed umount"
-               umount $MOUNT &
+               umount -f $MOUNT &
                UMOUNT_PID=$!
                sleep 2
                echo "killing umount"
@@ -966,6 +966,7 @@ test_24b() {
                --reformat $fs2mdsdev $fs2mdsvdev || exit 10
        setup
        start fs2mds $fs2mdsdev $MDS_MOUNT_OPTS && return 2
+       stop fs2mds -f
        cleanup || return 6
 }
 run_test 24b "Multiple MGSs on a single node (should return err)"