From owner-svn-src-user@FreeBSD.ORG  Wed Dec 25 08:34:36 2013
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 6357A3A8;
 Wed, 25 Dec 2013 08:34:36 +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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 4F890102F;
 Wed, 25 Dec 2013 08:34:36 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBP8YaAn028363;
 Wed, 25 Dec 2013 08:34:36 GMT (envelope-from pho@svn.freebsd.org)
Received: (from pho@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBP8YasC028362;
 Wed, 25 Dec 2013 08:34:36 GMT (envelope-from pho@svn.freebsd.org)
Message-Id: <201312250834.rBP8YasC028362@svn.freebsd.org>
From: Peter Holm <pho@FreeBSD.org>
Date: Wed, 25 Dec 2013 08:34:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r259864 - 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.17
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: Wed, 25 Dec 2013 08:34:36 -0000

Author: pho
Date: Wed Dec 25 08:34:35 2013
New Revision: 259864
URL: http://svnweb.freebsd.org/changeset/base/259864

Log:
  Do not assume that "/var" is a mount point. Use a MD based file system.
  
  Sponsored by:	EMC / Isilon storage division

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

Modified: user/pho/stress2/misc/recursiveflushes.sh
==============================================================================
--- user/pho/stress2/misc/recursiveflushes.sh	Wed Dec 25 06:46:31 2013	(r259863)
+++ user/pho/stress2/misc/recursiveflushes.sh	Wed Dec 25 08:34:35 2013	(r259864)
@@ -32,6 +32,8 @@
 
 [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1
 
+. ../default.cfg
+
 snap() {
    for i in `jot 5`; do
       mksnap_ffs $1 $2
@@ -39,15 +41,21 @@ snap() {
    done
 }
 
+mount | grep $mntpoint | grep -q /dev/md && umount -f $mntpoint
+mdconfig -l | grep -q md$mdstart &&  mdconfig -d -u $mdstart
+mdconfig -a -t swap -s 4g -u $mdstart || exit 1
+bsdlabel -w md$mdstart auto
+newfs $newfs_flags md${mdstart}$part > /dev/null
+mount /dev/md${mdstart}$part $mntpoint
+
 old=`sysctl vfs.recursiveflushes | awk '{print $NF}'`
-cd /var/tmp
-rm -f /var/.snap/pho.*
-trap "rm -f /var/.snap/pho.*" 0
-snap /var /var/.snap/pho.1
-snap /var /var/.snap/pho.2
-snap /var /var/.snap/pho.3
-snap /var /var/.snap/pho.4
-snap /var /var/.snap/pho.5
+cd $mntpoint
+rm -f $mntpoint/.snap/pho.*
+snap $mntpoint $mntpoint/.snap/pho.1
+snap $mntpoint $mntpoint/.snap/pho.2
+snap $mntpoint $mntpoint/.snap/pho.3
+snap $mntpoint $mntpoint/.snap/pho.4
+snap $mntpoint $mntpoint/.snap/pho.5
 
 for i in `jot 32`; do
    # Create 32 Mb files
@@ -60,6 +68,12 @@ for i in `jot 32`; do
    rm -f big.$i
 done
 
-rm -f /var/.snap/pho.*
+rm -f $mntpoint/.snap/pho.*
 new=`sysctl vfs.recursiveflushes | awk '{print $NF}'`
 [ $old != $new ] && echo "vfs.recursiveflushes changed from $old to $new"
+
+cd /
+while mount | grep $mntpoint | grep -q /dev/md; do
+	umount $mntpoint || sleep 1
+done
+mdconfig -d -u $mdstart