LU-3665 tests: Cleanup echo client after obdfilter-survey

[fs/lustre-release.git] / lustre / tests / test-framework.sh

diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index 1630e79..c88646d 100755 (executable)
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -1830,6 +1830,9 @@ dm_cleanup_dev() {
 
        # detach a loop device
        [[ $major -ne 7 ]] || cleanup_loop_device $facet /dev/loop$minor
+
+       # unload dm-flakey module
+       do_facet $facet "modprobe -r dm-flakey" || true
 }
 
 mount_facet() {
@@ -3055,7 +3058,7 @@ wait_mds_ost_sync () {
        done
 
        # show which nodes are not finished.
-       cmd=$(echo $cmd | sed '/-n//')
+       cmd=$(echo $cmd | sed 's/-n//')
        do_nodes $list "$cmd"
        echo "$facet recovery node $i not done in $WAIT_TIMEOUT sec. $STATUS"
        return 1
@@ -4147,8 +4150,8 @@ cleanupall() {
        nfs_client_mode && return
        cifs_client_mode && return
 
-       CLEANUP_DM_DEV=true stopall $*
        cleanup_echo_devs
+       CLEANUP_DM_DEV=true stopall $*
 
        unload_modules
        cleanup_sk
@@ -7177,7 +7180,7 @@ create_pool() {
        local fsname=${1%%.*}
        local poolname=${1##$fsname.}
 
-       trap "destroy_test_pools $fsname" EXIT
+       stack_trap "destroy_test_pools $fsname" EXIT
        do_facet mgs lctl pool_new $1
        local RC=$?
        # get param should return err unless pool is created