From owner-svn-src-user@freebsd.org  Tue Apr 10 09:01:06 2018
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:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6D953F8ACC9
 for <svn-src-user@mailman.ysv.freebsd.org>;
 Tue, 10 Apr 2018 09:01:06 +0000 (UTC) (envelope-from pho@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 1D2CF6BEB7;
 Tue, 10 Apr 2018 09:01:06 +0000 (UTC) (envelope-from pho@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 155F632EE;
 Tue, 10 Apr 2018 09:01:06 +0000 (UTC) (envelope-from pho@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w3A915bE022711;
 Tue, 10 Apr 2018 09:01:05 GMT (envelope-from pho@FreeBSD.org)
Received: (from pho@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w3A915SW022710;
 Tue, 10 Apr 2018 09:01:05 GMT (envelope-from pho@FreeBSD.org)
Message-Id: <201804100901.w3A915SW022710@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, 10 Apr 2018 09:01:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r332356 - user/pho/stress2/misc
X-SVN-Group: user
X-SVN-Commit-Author: pho
X-SVN-Commit-Paths: user/pho/stress2/misc
X-SVN-Commit-Revision: 332356
X-SVN-Commit-Repository: base
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.25
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 10 Apr 2018 09:01:06 -0000

Author: pho
Date: Tue Apr 10 09:01:05 2018
New Revision: 332356
URL: https://svnweb.freebsd.org/changeset/base/332356

Log:
  Do not trust /dev/md* when detaching memory disks. See test mdconfig2.sh
  Style fix, while here.
  
  Sponsored by:	Dell EMC Isilon

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

Modified: user/pho/stress2/misc/cleanup.sh
==============================================================================
--- user/pho/stress2/misc/cleanup.sh	Tue Apr 10 08:56:47 2018	(r332355)
+++ user/pho/stress2/misc/cleanup.sh	Tue Apr 10 09:01:05 2018	(r332356)
@@ -36,7 +36,7 @@ MOUNTS=31
 mount | grep -q "on $mntpoint " && umount -f $mntpoint
 rm -rf $mntpoint/stressX*
 rm -f /tmp/.snap/stress2* /var/.snap/stress2*
-rm -rf /tmp/stressX.control $RUNDIR /tmp/misc.name
+rm -rf /tmp/stressX.control $RUNDIR
 [ -d `dirname "$diskimage"` ] || mkdir -p `dirname "$diskimage"`
 mkdir -p $RUNDIR
 chmod 0777 $RUNDIR
@@ -44,20 +44,26 @@ chmod 0777 $RUNDIR
 s=0
 for i in `jot $MOUNTS 0 | sort -nr` ""; do
 	while mount | grep -q "on ${mntpoint}$i "; do
-		fstat -mf ${mntpoint}$i | sed 1d | awk '{print $3}' | xargs kill
+		fstat -mf ${mntpoint}$i | sed 1d | awk '{print $3}' | \
+		    xargs kill
 		umount -f ${mntpoint}$i > /dev/null 2>&1 || s=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
+		[ -d ${mntpoint}$i ] && find ${mntpoint}$i -delete \
+			2>/dev/null
 		rm -rf ${mntpoint}$i > /dev/null 2>&1
 	fi
 done
 [ -d "$mntpoint" ] && (cd $mntpoint && find . -delete)
-for i in `jot $MOUNTS $mdstart`; do
-	[ -c /dev/md$i ] &&  { mdconfig -d -u $i || s=1; }
+units=`mdconfig -l | sed 's/md//g'`
+for u in $units; do
+	if [ $u -ge $mdstart -a $u -lt $((mdstart + MOUNTS)) ]; then
+	    mdconfig -d -u $u || s=1
+	    [ -c /dev/md$u ] && sleep .1
+	fi
 done
 
 # Delete $testuser's ipcs