Date: Sun, 22 Feb 2015 14:03:40 +0000 (UTC) From: Peter Holm <pho@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r279155 - user/pho/stress2/misc Message-ID: <201502221403.t1ME3ecd056488@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pho Date: Sun Feb 22 14:03:40 2015 New Revision: 279155 URL: https://svnweb.freebsd.org/changeset/base/279155 Log: Added "retrycnt" to nfs mount option. Sponsored by: EMC / Isilon storage division Modified: user/pho/stress2/misc/nfs10.sh user/pho/stress2/misc/nfs11.sh user/pho/stress2/misc/nullfs8.sh Modified: user/pho/stress2/misc/nfs10.sh ============================================================================== --- user/pho/stress2/misc/nfs10.sh Sun Feb 22 13:36:44 2015 (r279154) +++ user/pho/stress2/misc/nfs10.sh Sun Feb 22 14:03:40 2015 (r279155) @@ -35,7 +35,8 @@ . ../default.cfg -grep -q $mntpoint /etc/exports || { echo "$mntpoint missing from /etc/exports"; exit 0; } +grep -q $mntpoint /etc/exports || + { echo "$mntpoint missing from /etc/exports"; exit 0; } m2=${mntpoint}2 [ -d $m2 ] || mkdir $m2 @@ -51,7 +52,7 @@ newfs $newfs_flags md${mdstart}$part > / mount /dev/md${mdstart}$part $mntpoint chmod 777 $mntpoint -mount -t nfs -o nfsv4 -o rw 127.0.0.1:$mntpoint $m2 +mount -t nfs -o nfsv4 -o rw,retrycnt=3 127.0.0.1:$mntpoint $m2 export RUNDIR=$m2/stressX export runRUNTIME=10m # Run tests for 10 minutes Modified: user/pho/stress2/misc/nfs11.sh ============================================================================== --- user/pho/stress2/misc/nfs11.sh Sun Feb 22 13:36:44 2015 (r279154) +++ user/pho/stress2/misc/nfs11.sh Sun Feb 22 14:03:40 2015 (r279155) @@ -34,7 +34,8 @@ . ../default.cfg -grep -q $mntpoint /etc/exports || { echo "$mntpoint missing from /etc/exports"; exit 0; } +grep -q $mntpoint /etc/exports || + { echo "$mntpoint missing from /etc/exports"; exit 0; } m2=${mntpoint}2 [ -d $m2 ] || mkdir $m2 @@ -50,12 +51,12 @@ newfs $newfs_flags md${mdstart}$part > / mount /dev/md${mdstart}$part $mntpoint chmod 777 $mntpoint -mount -t nfs -o nfsv4 -o rw 127.0.0.1:$mntpoint $m2 +mount -t nfs -o nfsv4 -o rw,retrycnt=3 127.0.0.1:$mntpoint $m2 export RUNDIR=$m2/stressX export runRUNTIME=10m # Run tests for 10 minutes -su $testuser -c "(cd ..; ./run.sh marcus.cfg)" +su $testuser -c "(cd ..; ./run.sh marcus.cfg)" while mount | grep "on $m2 " | grep -q nfs; do umount $m2 Modified: user/pho/stress2/misc/nullfs8.sh ============================================================================== --- user/pho/stress2/misc/nullfs8.sh Sun Feb 22 13:36:44 2015 (r279154) +++ user/pho/stress2/misc/nullfs8.sh Sun Feb 22 14:03:40 2015 (r279155) @@ -36,7 +36,9 @@ . ../default.cfg -opt="-o nfsv3,rw,udp,rdirplus,noauto" +opt="-o nfsv3,rw,udp,rdirplus,noauto,retrycnt=3" +grep -q $mntpoint /etc/exports || + { echo "$mntpoint missing from /etc/exports"; exit 0; } mount | grep -wq $mntpoint && umount $mntpoint mount -t nullfs /tmp $mntpoint
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201502221403.t1ME3ecd056488>