From c686c6fe759bdf408eab85ebe65c048e04706e43 Mon Sep 17 00:00:00 2001
From: Tony Nguyen <tony.nguyen@delphix.com>
Date: Sun, 23 Aug 2020 16:14:22 -0600
Subject: [PATCH] ZFS performance tests should clean up NFS mount

This change umounts client's NFS mount after each test so we can avoid
two sporadic issues:
1) client NFS stale mount and
2) zpool export and zpool destroy failed due to dataset busy

Reviewed-by: Ryan Moeller <ryan@iXsystems.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Tony Nguyen <tony.nguyen@delphix.com>
Closes #10767
---
 tests/zfs-tests/tests/perf/perf.shlib | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/zfs-tests/tests/perf/perf.shlib b/tests/zfs-tests/tests/perf/perf.shlib
index 1c498607e012..6addd46610c2 100644
--- a/tests/zfs-tests/tests/perf/perf.shlib
+++ b/tests/zfs-tests/tests/perf/perf.shlib
@@ -146,6 +146,7 @@ function do_fio_run_impl
 			    --output /tmp/fio.out /tmp/test.fio
 		"
 		log_must scp $NFS_USER@$NFS_CLIENT:/tmp/fio.out $outfile
+		log_must ssh -t $NFS_USER@$NFS_CLIENT "sudo -S umount $NFS_MOUNT"
 	else
 		log_must fio --output-format=${PERF_FIO_FORMAT} \
 		    --output $outfile $FIO_SCRIPTS/$script
@@ -197,7 +198,7 @@ function do_fio_run
 function do_setup_nfs
 {
 	typeset script=$1
-	zfs  set sharenfs=on $TESTFS
+	zfs set sharenfs=on $TESTFS
 	log_must chmod  -R 777 /$TESTFS
 
 	ssh -t $NFS_USER@$NFS_CLIENT "mkdir -m 777 -p $NFS_MOUNT"