From owner-svn-src-projects@FreeBSD.ORG  Thu Dec 29 11:38:03 2011
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3C6BC106566B;
	Thu, 29 Dec 2011 11:38:03 +0000 (UTC) (envelope-from pho@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 27A858FC15;
	Thu, 29 Dec 2011 11:38:03 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pBTBc3an054468;
	Thu, 29 Dec 2011 11:38:03 GMT (envelope-from pho@svn.freebsd.org)
Received: (from pho@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pBTBc28Y054466;
	Thu, 29 Dec 2011 11:38:02 GMT (envelope-from pho@svn.freebsd.org)
Message-Id: <201112291138.pBTBc28Y054466@svn.freebsd.org>
From: Peter Holm <pho@FreeBSD.org>
Date: Thu, 29 Dec 2011 11:38:02 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r228951 - projects/stress2/misc
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 29 Dec 2011 11:38:03 -0000

Author: pho
Date: Thu Dec 29 11:38:02 2011
New Revision: 228951
URL: http://svn.freebsd.org/changeset/base/228951

Log:
  Use the global configuration file for MD(4) operations. Limit run time to
  half an hour.

Modified:
  projects/stress2/misc/snap4.sh

Modified: projects/stress2/misc/snap4.sh
==============================================================================
--- projects/stress2/misc/snap4.sh	Thu Dec 29 11:37:15 2011	(r228950)
+++ projects/stress2/misc/snap4.sh	Thu Dec 29 11:38:02 2011	(r228951)
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright (c) 2008 Peter Holm <pho@FreeBSD.org>
+# Copyright (c) 2008, 2011 Peter Holm <pho@FreeBSD.org>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -32,21 +32,24 @@
 
 # Test with snapshot file unlinked before unmount
 
-mount | grep "/dev/md0 on /mnt" > /dev/null && umount /mnt
-mdconfig -l | grep -q md0 &&  mdconfig -d -u 0
+. ../default.cfg
+
+mount | grep -q "/dev/md$mdstart on $mntpoint" && umount $mntpoint
+mdconfig -l | grep -q md$mdstart &&  mdconfig -d -u $mdstart
 rm -f /tmp/.snap/pho
 trap "rm -f /tmp/.snap/pho" 0
 
-for i in `jot 64`; do
+start=`date '+%s'`
+while [ `date '+%s'` -lt $((start + 1800)) ]; do
    mksnap_ffs /tmp /tmp/.snap/pho
-   mdconfig -a -t vnode -f /tmp/.snap/pho -u 0 -o readonly
-   mount -o ro /dev/md0 /mnt
+   mdconfig -a -t vnode -f /tmp/.snap/pho -u $mdstart -o readonly
+   mount -o ro /dev/md$mdstart $mntpoint
 
-   ls -l /mnt > /dev/null
+   ls -l $mntpoint > /dev/null
    rm -f /tmp/.snap/pho
    sleep 1
 
-   umount /mnt
-   mdconfig -d -u 0
+   umount $mntpoint
+   mdconfig -d -u $mdstart
    rm -f /tmp/.snap/pho
 done