c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2024-12-26 11:19:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

ZFS performance tests should clean up NFS mount

Browse Source 
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
This commit is contained in:
Tony Nguyen 2020-08-23 16:14:22 -06:00 committed by GitHub
parent 68f2288620
commit c686c6fe75
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/zfs-tests/tests/perf/perf.shlib
View File

@ -146,6 +146,7 @@ function do_fio_run_impl
--output /tmp/fio.out /tmp/test.fio --output /tmp/fio.out /tmp/test.fio
" "
log_must scp $NFS_USER@$NFS_CLIENT:/tmp/fio.out $outfile 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 else
log_must fio --output-format=${PERF_FIO_FORMAT} \ log_must fio --output-format=${PERF_FIO_FORMAT} \
--output $outfile $FIO_SCRIPTS/$script --output $outfile $FIO_SCRIPTS/$script
@ -197,7 +198,7 @@ function do_fio_run
function do_setup_nfs function do_setup_nfs
{ {
typeset script=$1 typeset script=$1
zfs set sharenfs=on $TESTFS zfs set sharenfs=on $TESTFS
log_must chmod -R 777 /$TESTFS log_must chmod -R 777 /$TESTFS
ssh -t $NFS_USER@$NFS_CLIENT "mkdir -m 777 -p $NFS_MOUNT" ssh -t $NFS_USER@$NFS_CLIENT "mkdir -m 777 -p $NFS_MOUNT"