From owner-svn-src-user@FreeBSD.ORG  Sun Jul 28 09:57:43 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 ESMTP id 7734E45D;
 Sun, 28 Jul 2013 09:57:43 +0000 (UTC) (envelope-from pho@FreeBSD.org)
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 657A42754;
 Sun, 28 Jul 2013 09:57:43 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6S9vgdK095990;
 Sun, 28 Jul 2013 09:57:42 GMT (envelope-from pho@svn.freebsd.org)
Received: (from pho@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6S9vgFh095989;
 Sun, 28 Jul 2013 09:57:42 GMT (envelope-from pho@svn.freebsd.org)
Message-Id: <201307280957.r6S9vgFh095989@svn.freebsd.org>
From: Peter Holm <pho@FreeBSD.org>
Date: Sun, 28 Jul 2013 09:57:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r253741 - 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.14
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: Sun, 28 Jul 2013 09:57:43 -0000

Author: pho
Date: Sun Jul 28 09:57:42 2013
New Revision: 253741
URL: http://svnweb.freebsd.org/changeset/base/253741

Log:
  Improve the way cleanup is done for the tests.
  
  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	Sun Jul 28 07:58:34 2013	(r253740)
+++ user/pho/stress2/misc/cleanup.sh	Sun Jul 28 09:57:42 2013	(r253741)
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright (c) 2008 Peter Holm <pho@FreeBSD.org>
+# Copyright (c) 2008-2013 Peter Holm <pho@FreeBSD.org>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -32,17 +32,21 @@
 
 . ../default.cfg
 
-[ ! -z "$mntpoint" ] && rm -rf ${mntpoint}*/*
+mount | grep -wq $mntpoint && umount -f $mntpoint
+rm -rf ${mntpoint}/stressX*
 rm -f /tmp/.snap/pho* /var/.snap/pho*
-rm -rf /tmp/stressX.control
+rm -rf /tmp/stressX.control $RUNDIR /tmp/misc.name
+mkdir -p $RUNDIR
+chmod 0777 $RUNDIR
 
-mount | grep -wq $mntpoint && umount $mntpoint
+for i in `jot 16 0 | sort -nr` ""; do
+	while mount | grep -q "${mntpoint}$i "; do
+		fstat ${mntpoint}$i | sed 1d | awk '{print $3}' | xargs kill
+		umount -f ${mntpoint}$i > /dev/null 2>&1
+	done
+done
 m=$mdstart
 for i in `jot 15`; do
-   while mount | grep -q ${mntpoint}$m; do
-      rm -rf ${mntpoint}$m
-      umount -f ${mntpoint}$m > /dev/null 2>&1
-   done
-   mdconfig -l | grep -q md$m &&  mdconfig -d -u $m
-   m=$((m + 1))
+	mdconfig -l | grep -q md$m &&  mdconfig -d -u $m
+	m=$((m + 1))
 done