From owner-svn-src-user@freebsd.org  Fri Jul 31 09:10:57 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 603A19AE657
 for <svn-src-user@mailman.ysv.freebsd.org>;
 Fri, 31 Jul 2015 09:10:57 +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 51D831E0C;
 Fri, 31 Jul 2015 09:10:57 +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 t6V9AvbG026429;
 Fri, 31 Jul 2015 09:10:57 GMT (envelope-from pho@FreeBSD.org)
Received: (from pho@localhost)
 by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6V9Av8D026428;
 Fri, 31 Jul 2015 09:10:57 GMT (envelope-from pho@FreeBSD.org)
Message-Id: <201507310910.t6V9Av8D026428@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:10:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r286117 - 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:10:57 -0000

Author: pho
Date: Fri Jul 31 09:10:56 2015
New Revision: 286117
URL: https://svnweb.freebsd.org/changeset/base/286117

Log:
  Reduce runtime and clean up script while here.
  
  Sponsored by:	EMC / Isilon storage division

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

Modified: user/pho/stress2/misc/parallelmount.sh
==============================================================================
--- user/pho/stress2/misc/parallelmount.sh	Fri Jul 31 09:09:16 2015	(r286116)
+++ user/pho/stress2/misc/parallelmount.sh	Fri Jul 31 09:10:56 2015	(r286117)
@@ -38,7 +38,7 @@
 parallel=40
 
 if [ $# -eq 0 ]; then
-	mdconfig -l | grep -q md$mdstart && mdconfig -d -u $mdstart
+	[ -c /dev/md$mdstart ] && mdconfig -d -u $mdstart
 	mdconfig -a -t swap -s 10m -u $mdstart || exit 1
 	bsdlabel -w md$mdstart auto
 	newfs $newfs_flags md${mdstart}$part > /dev/null
@@ -53,19 +53,16 @@ if [ $# -eq 0 ]; then
 			find $mntpoint > /dev/null 2>&1
 		done
 	done
-
-	for i in `jot $parallel`; do
-		wait
-	done
+	wait
 
 	while mount | grep $mntpoint | grep -q /dev/md; do
 		umount $mntpoint || sleep 1
 	done
 	mdconfig -d -u $mdstart
 else
-	for i in `jot 1000`; do
-		mount /dev/md${mdstart}$part $mntpoint > /dev/null 2>&1
-		umount $mntpoint > /dev/null 2>&1
-		mount > /dev/null
-	done
+	for i in `jot 200`; do
+		mount /dev/md${mdstart}$part $mntpoint
+		umount $mntpoint
+		mount
+	done > /dev/null 2>&1
 fi