From owner-svn-src-user@freebsd.org  Mon Jan  8 08:32:08 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:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id F3A47E5AF1B
 for <svn-src-user@mailman.ysv.freebsd.org>;
 Mon,  8 Jan 2018 08:32:08 +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 CE951704FD;
 Mon,  8 Jan 2018 08:32:08 +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 1F3EB2D45F;
 Mon,  8 Jan 2018 08:32:08 +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 w088W7GP051039;
 Mon, 8 Jan 2018 08:32:07 GMT (envelope-from pho@FreeBSD.org)
Received: (from pho@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w088W7st051025;
 Mon, 8 Jan 2018 08:32:07 GMT (envelope-from pho@FreeBSD.org)
Message-Id: <201801080832.w088W7st051025@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: Mon, 8 Jan 2018 08:32:07 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r327687 - 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: 327687
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: Mon, 08 Jan 2018 08:32:09 -0000

Author: pho
Date: Mon Jan  8 08:32:07 2018
New Revision: 327687
URL: https://svnweb.freebsd.org/changeset/base/327687

Log:
  Return status.
  
  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	Mon Jan  8 00:57:28 2018	(r327686)
+++ user/pho/stress2/misc/cleanup.sh	Mon Jan  8 08:32:07 2018	(r327687)
@@ -34,17 +34,18 @@
 
 MOUNTS=31
 mount | grep -q "on $mntpoint " && umount -f $mntpoint
-rm -rf ${mntpoint}/stressX*
+rm -rf $mntpoint/stressX*
 rm -f /tmp/.snap/stress2* /var/.snap/stress2*
 rm -rf /tmp/stressX.control $RUNDIR /tmp/misc.name
 [ -d `dirname "$diskimage"` ] || mkdir -p `dirname "$diskimage"`
 mkdir -p $RUNDIR
 chmod 0777 $RUNDIR
 
+s=0
 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
+		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
@@ -54,14 +55,12 @@ for i in `jot $MOUNTS 0`; do
 		rm -rf ${mntpoint}$i > /dev/null 2>&1
 	fi
 done
-find $mntpoint/* -delete 2>/dev/null
-m=$mdstart
-for i in `jot $MOUNTS`; do
-	[ -c /dev/md$m ] &&  mdconfig -d -u $m
-	m=$((m + 1))
+[ -d "$mntpoint" ] && (cd $mntpoint && find . -delete)
+for i in `jot $MOUNTS $mdstart`; do
+	[ -c /dev/md$i ] &&  { mdconfig -d -u $i || s=1; }
 done
 
 # Delete $testuser's ipcs
 ipcs | awk "\$5 ~/$testuser/ && \$6 ~/$testuser/ {print \"-\" \$1,\$2}" | \
     xargs -t ipcrm
-
+exit $s