From owner-svn-src-user@FreeBSD.ORG  Sun Feb 22 14:03:41 2015
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id CED8DB6B;
 Sun, 22 Feb 2015 14:03:41 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id A192A6BD;
 Sun, 22 Feb 2015 14:03:41 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1ME3fwo056493;
 Sun, 22 Feb 2015 14:03:41 GMT (envelope-from pho@FreeBSD.org)
Received: (from pho@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1ME3ecd056488;
 Sun, 22 Feb 2015 14:03:40 GMT (envelope-from pho@FreeBSD.org)
Message-Id: <201502221403.t1ME3ecd056488@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: pho set sender to pho@FreeBSD.org
 using -f
From: Peter Holm <pho@FreeBSD.org>
Date: Sun, 22 Feb 2015 14:03:40 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r279155 - user/pho/stress2/misc
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 22 Feb 2015 14:03:41 -0000

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