Skip to content

Commit

Permalink
ZFS performance tests should clean up NFS mount
Browse files Browse the repository at this point in the history
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
  • Loading branch information
tonynguien authored Aug 23, 2020
1 parent 68f2288 commit c686c6f
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion tests/zfs-tests/tests/perf/perf.shlib
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand Down

0 comments on commit c686c6f

Please sign in to comment.