From owner-svn-src-user@freebsd.org  Fri Jul 31 09:08:07 2015
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id D42269AE5D2
 for <svn-src-user@mailman.ysv.freebsd.org>;
 Fri, 31 Jul 2015 09:08:07 +0000 (UTC) (envelope-from pho@FreeBSD.org)
Received: from repo.freebsd.org (repo.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 C5F5419EE;
 Fri, 31 Jul 2015 09:08:07 +0000 (UTC) (envelope-from pho@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6V987Ft023837;
 Fri, 31 Jul 2015 09:08:07 GMT (envelope-from pho@FreeBSD.org)
Received: (from pho@localhost)
 by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6V987hE023836;
 Fri, 31 Jul 2015 09:08:07 GMT (envelope-from pho@FreeBSD.org)
Message-Id: <201507310908.t6V987hE023836@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org
 using -f
From: Peter Holm <pho@FreeBSD.org>
Date: Fri, 31 Jul 2015 09:08:07 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r286115 - 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.20
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: Fri, 31 Jul 2015 09:08:07 -0000

Author: pho
Date: Fri Jul 31 09:08:06 2015
New Revision: 286115
URL: https://svnweb.freebsd.org/changeset/base/286115

Log:
  Reduce runtime and handle umount(1) failure.
  
  Sponsored by:	EMC / Isilon storage division

Modified:
  user/pho/stress2/misc/snap7.sh

Modified: user/pho/stress2/misc/snap7.sh
==============================================================================
--- user/pho/stress2/misc/snap7.sh	Fri Jul 31 09:04:22 2015	(r286114)
+++ user/pho/stress2/misc/snap7.sh	Fri Jul 31 09:08:06 2015	(r286115)
@@ -43,7 +43,7 @@ mount | grep "$mntpoint" | grep -q md$md
 mdconfig -l | grep -q md$mdstart &&  mdconfig -d -u $mdstart
 
 start=`date '+%s'`
-while [ `date '+%s'` -lt $((start + 1800)) ]; do
+while [ `date '+%s'` -lt $((start + 1200)) ]; do
    mksnap_ffs /tmp /tmp/.snap/stress2.1
    mdconfig -a -t vnode -f /tmp/.snap/stress2.1 -u $mdstart -o readonly
    sh -c "while true; do ls $mntpoint > /dev/null;done" &
@@ -52,6 +52,9 @@ while [ `date '+%s'` -lt $((start + 1800
       umount $mntpoint 2>/dev/null
    done
    kill $!
+   while mount | grep -q "/dev/md$mdstart on $mntpoint"; do
+      umount $mntpoint 2>/dev/null
+   done
    mdconfig -d -u $mdstart
    rm -f /tmp/.snap/stress2.1
 done