aboutsummaryrefslogtreecommitdiffstats
path: root/tests/zfs-tests
diff options
context:
space:
mode:
authorTony Nguyen <[email protected]>2020-08-23 16:14:22 -0600
committerGitHub <[email protected]>2020-08-23 15:14:22 -0700
commitc686c6fe759bdf408eab85ebe65c048e04706e43 (patch)
treeca861aab45ee5ef6e394a7a3ef1afa606b5be0cf /tests/zfs-tests
parent68f2288620f2a5401ded0ca0834e146a28e8b9f9 (diff)
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 <[email protected]> Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Tony Nguyen <[email protected]> Closes #10767
Diffstat (limited to 'tests/zfs-tests')
-rw-r--r--tests/zfs-tests/tests/perf/perf.shlib3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/zfs-tests/tests/perf/perf.shlib b/tests/zfs-tests/tests/perf/perf.shlib
index 1c498607e..6addd4661 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"