From owner-svn-src-user@freebsd.org Tue Dec 29 12:38:05 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 AF081A53905
for <svn-src-user@mailman.ysv.freebsd.org>;
Tue, 29 Dec 2015 12:38:05 +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 mx1.freebsd.org (Postfix) with ESMTPS id 80F7117EB;
Tue, 29 Dec 2015 12:38:05 +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 tBTCc4qS021981;
Tue, 29 Dec 2015 12:38:04 GMT (envelope-from pho@FreeBSD.org)
Received: (from pho@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBTCc46Y021980;
Tue, 29 Dec 2015 12:38:04 GMT (envelope-from pho@FreeBSD.org)
Message-Id: <201512291238.tBTCc46Y021980@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, 29 Dec 2015 12:38:04 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r292869 - 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 " user"
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, 29 Dec 2015 12:38:05 -0000
Author: pho
Date: Tue Dec 29 12:38:04 2015
New Revision: 292869
URL: https://svnweb.freebsd.org/changeset/base/292869
Log:
Make sure the directory for the $diskimage file exists.
Added IPC 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 Dec 29 12:35:12 2015 (r292868)
+++ user/pho/stress2/misc/cleanup.sh Tue Dec 29 12:38:04 2015 (r292869)
@@ -37,6 +37,7 @@ mount | grep -q "on $mntpoint " && umoun
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
@@ -59,3 +60,8 @@ for i in `jot $MOUNTS`; do
[ -c /dev/md$m ] && mdconfig -d -u $m
m=$((m + 1))
done
+
+# Delete $testuser's ipcs
+ipcs | awk "\$5 ~/$testuser/ && \$6 ~/$testuser/ {print \"-\" \$1,\$2}" | \
+ xargs -t ipcrm
+