From owner-svn-src-user@freebsd.org  Tue Jul  7 07:42:10 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 0F139995B57
 for <svn-src-user@mailman.ysv.freebsd.org>;
 Tue,  7 Jul 2015 07:42:10 +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 0029014E1;
 Tue,  7 Jul 2015 07:42:09 +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 t677g9nC021428;
 Tue, 7 Jul 2015 07:42:09 GMT (envelope-from pho@FreeBSD.org)
Received: (from pho@localhost)
 by repo.freebsd.org (8.14.9/8.14.9/Submit) id t677g98g021427;
 Tue, 7 Jul 2015 07:42:09 GMT (envelope-from pho@FreeBSD.org)
Message-Id: <201507070742.t677g98g021427@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: Tue, 7 Jul 2015 07:42:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r285239 - 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: Tue, 07 Jul 2015 07:42:10 -0000

Author: pho
Date: Tue Jul  7 07:42:08 2015
New Revision: 285239
URL: https://svnweb.freebsd.org/changeset/base/285239

Log:
  Added constant for number of test mount points to cleanup.
  Added minor improvements to the cleanup.
  
  Sponsored by:	 EMC / Isilon storage division

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

Modified: user/pho/stress2/misc/cleanup.sh
==============================================================================
--- user/pho/stress2/misc/cleanup.sh	Tue Jul  7 07:28:15 2015	(r285238)
+++ user/pho/stress2/misc/cleanup.sh	Tue Jul  7 07:42:08 2015	(r285239)
@@ -32,21 +32,30 @@
 
 . ../default.cfg
 
-mount | grep -wq $mntpoint && umount -f $mntpoint
+MOUNTS=31
+mount | grep -q "on $mntpoint " && umount -f $mntpoint
 rm -rf ${mntpoint}/stressX*
-rm -f /tmp/.snap/pho* /var/.snap/pho*
+rm -f /tmp/.snap/stress2* /var/.snap/stress2*
 rm -rf /tmp/stressX.control $RUNDIR /tmp/misc.name
 mkdir -p $RUNDIR
 chmod 0777 $RUNDIR
 
-for i in `jot 16 0 | sort -nr` ""; do
-	while mount | grep -q "${mntpoint}$i "; do
+for i in `jot $MOUNTS 0 | sort -nr` ""; do
+	while mount | grep -q "on ${mntpoint}$i "; do
 		fstat ${mntpoint}$i | sed 1d | awk '{print $3}' | xargs kill
 		umount -f ${mntpoint}$i > /dev/null 2>&1
 	done
 done
+# Delete the test mount points /mnt0 .. /mnt31
+for i in `jot $MOUNTS 0`; do
+	if ! mount | grep -q "on ${mntpoint}$i "; then
+		[ -d ${mntpoint}$i ] && find ${mntpoint}$i -delete 2>/dev/null
+		rm -rf ${mntpoint}$i > /dev/null 2>&1
+	fi
+done
+find $mntpoint/* -delete 2>/dev/null
 m=$mdstart
-for i in `jot 15`; do
-	mdconfig -l | grep -q md$m &&  mdconfig -d -u $m
+for i in `jot $MOUNTS`; do
+	[ -c /dev/md$m ] &&  mdconfig -d -u $m
 	m=$((m + 1))
 done