LU-10649 llite: yield cpu after call to ll_agl_trigger

[fs/lustre-release.git] / lustre / tests / mmp.sh

diff --git a/lustre/tests/mmp.sh b/lustre/tests/mmp.sh
index db5ce5a..ba2dcbf 100755 (executable)
--- a/lustre/tests/mmp.sh
+++ b/lustre/tests/mmp.sh
@@ -187,12 +187,12 @@ mmp_init() {
        init_vars
 
        if [ $(facet_fstype $MMP_MDS) != ldiskfs ]; then
-               skip "Only applicable to ldiskfs-based MDTs"
+               skip "ldiskfs only test"
                exit
        fi
 
        if [ $(facet_fstype $MMP_OSS) != ldiskfs ]; then
-               skip "Only applicable to ldiskfs-based OSTs"
+               skip "ldiskfs only test"
                exit
        fi
 
@@ -429,10 +429,11 @@ mmp_init
 
 # Test 1 - two mounts at the same time.
 test_1() {
-    check_failover_pair || return 0
+       check_failover_pair || return 0
 
-    mount_after_interval 0 0 || return ${PIPESTATUS[0]}
-    stop_services primary || return ${PIPESTATUS[0]}
+       mount_after_interval 0 0 || return ${PIPESTATUS[0]}
+       stop_services primary || return ${PIPESTATUS[0]}
+       stop_services failover || return ${PIPESTATUS[0]}
 }
 run_test 1 "two mounts at the same time"
 
@@ -662,7 +663,7 @@ test_10() {
         error_noexit "e2fsck $MMP_OSTDEV on $MMP_OSS_FAILOVER returned $rc"
     fi
 
-    stop_services primary || return ${PIPESTATUS[0]}
+    CLEANUP_DM_DEV=true stop_services primary || return ${PIPESTATUS[0]}
     return 0
 }
 run_test 10 "e2fsck with mounted filesystem"
@@ -672,4 +673,5 @@ FAIL_ON_ERROR=$SAVED_FAIL_ON_ERROR
 
 complete $SECONDS
 $MMP_RESTORE_MOUNT && setupall
+check_and_cleanup_lustre
 exit_status