11066 zfs clean_mirror tests should scrub between tests

Reviewed by: Toomas Soome <tsoome@me.com>
Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>
Approved by: Gordon Ross <gwr@nexenta.com>

usr/src/test/zfs-tests/tests/functional/clean_mirror/clean_mirror_common.kshlib

@@ -27,6 +27,7 @@
 #
 # Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 # Copyright (c) 2017 Datto Inc.
+# Copyright 2019 Joyent, Inc.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -48,6 +49,8 @@ function overwrite_verify_mirror
 	set -A cksums
 	set -A newcksums
 
+	scrub_pool # Make sure we have a clean pool before starting the test.
+
 	while (( atfile < FILE_COUNT )); do
 		files[$atfile]=$TESTDIR/file.$atfile
 		log_must file_write -o create -f $TESTDIR/file.$atfile \
@@ -86,3 +89,20 @@ function overwrite_verify_mirror
 
 	sync_pool $TESTPOOL
 }
+
+# Scrub the pool and wait for completion.
+function scrub_pool
+{
+        typeset pool=$TESTPOOL
+        log_note "Scrubbing $TESTPOOL"
+
+        # Flush all the pool data.
+        log_must zpool scrub $pool
+
+        while ! is_pool_scrubbed $pool; do
+                if is_pool_resilvered $pool ; then
+                        log_fail "$pool should not have been resilvered"
+                fi
+                log_must sleep 2
+        done
+}

usr/src/test/zfs-tests/tests/functional/clean_mirror/cleanup.ksh

@@ -27,6 +27,7 @@
 
 #
 # Copyright (c) 2013, 2016 by Delphix. All rights reserved.
+# Copyright 2019 Joyent, Inc.
 #
 
 . $STF_SUITE/tests/functional/clean_mirror/default.cfg
@@ -46,4 +47,8 @@ else
 	log_must cleanup_devices $MIRROR_PRIMARY $MIRROR_SECONDARY
 fi
 
+if [[ -d $TESTDIR ]]; then
+	log_must rmdir $TESTDIR
+fi
+
 log_pass