Whamcloud - gitweb
LU-10048 osd: async truncate
[fs/lustre-release.git] / lustre / tests / mmp.sh
index 4b0b02f..ba2dcbf 100755 (executable)
@@ -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
 
@@ -663,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"
@@ -673,4 +673,5 @@ FAIL_ON_ERROR=$SAVED_FAIL_ON_ERROR
 
 complete $SECONDS
 $MMP_RESTORE_MOUNT && setupall
+check_and_cleanup_lustre
 exit_status