From owner-svn-src-user@FreeBSD.ORG Sun Feb 22 17:50:21 2015 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 63551324; Sun, 22 Feb 2015 17:50:21 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 446DDDFA; Sun, 22 Feb 2015 17:50:21 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1MHoLGJ064992; Sun, 22 Feb 2015 17:50:21 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1MHoKPD064987; Sun, 22 Feb 2015 17:50:20 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201502221750.t1MHoKPD064987@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Sun, 22 Feb 2015 17:50:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r279169 - 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.18-1 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 Feb 2015 17:50:21 -0000 Author: pho Date: Sun Feb 22 17:50:19 2015 New Revision: 279169 URL: https://svnweb.freebsd.org/changeset/base/279169 Log: Use $mntpoint as mount point. Sponsored by: EMC / Isilon storage division Modified: user/pho/stress2/misc/nullfs3.sh user/pho/stress2/misc/nullfs5.sh user/pho/stress2/misc/union.sh Modified: user/pho/stress2/misc/nullfs3.sh ============================================================================== --- user/pho/stress2/misc/nullfs3.sh Sun Feb 22 17:48:48 2015 (r279168) +++ user/pho/stress2/misc/nullfs3.sh Sun Feb 22 17:50:19 2015 (r279169) @@ -36,20 +36,17 @@ . ../default.cfg -[ -d mp1 ] || mkdir mp1 -[ -d $RUNDIR ] || mkdir $RUNDIR +[ -d $RUNDIR/stressX ] || mkdir -p $RUNDIR/stressX -mp=`pwd`/mp1 +mp=$mntpoint mount | grep -q $mp && umount -f $mp mount -t nullfs `dirname $RUNDIR` $mp cd $mp/stressX -whereis something +whereis something > /dev/null cd / umount $mp mount | grep -q $mp && umount -f $mp - -rm -rf $mp Modified: user/pho/stress2/misc/nullfs5.sh ============================================================================== --- user/pho/stress2/misc/nullfs5.sh Sun Feb 22 17:48:48 2015 (r279168) +++ user/pho/stress2/misc/nullfs5.sh Sun Feb 22 17:50:19 2015 (r279169) @@ -50,22 +50,17 @@ for j in `jot 5`; do /tmp/kinfo & done -[ -d mp1 ] || mkdir mp1 +mount | grep -q $mntpoint && umount -f $mntpoint -mp=`pwd`/mp1 -mount | grep -q $mp && umount -f $mp +mount -t nullfs `dirname $RUNDIR` $mntpoint -mount -t nullfs `dirname $RUNDIR` $mp - -export RUNDIR=`pwd`/mp1/stressX +export RUNDIR=$mntpoint/stressX export runRUNTIME=10m (cd ..; ./run.sh marcus.cfg) -umount $mp 2>&1 | grep -v busy - -mount | grep -q $mp && umount -f $mp +umount $mntpoint 2>&1 | grep -v busy -rm -rf mp1 +mount | grep -q $mntpoint && umount -f $mntpoint for j in `jot 5`; do wait Modified: user/pho/stress2/misc/union.sh ============================================================================== --- user/pho/stress2/misc/union.sh Sun Feb 22 17:48:48 2015 (r279168) +++ user/pho/stress2/misc/union.sh Sun Feb 22 17:50:19 2015 (r279169) @@ -36,7 +36,6 @@ u1=$mdstart u2=$((u1 + 1)) -[ -d mp1 ] || mkdir mp1 mount | grep -q /dev/md${u2}$part && umount -f /dev/md${u2}$part mount | grep -q /dev/md${u1}$part && umount -f /dev/md${u1}$part @@ -51,12 +50,12 @@ mdconfig -s 256m -u $u2 bsdlabel -w md$u2 auto newfs md${u2}${part} > /dev/null -mount -o ro /dev/md${u1}$part mp1 -mount -o union /dev/md${u2}$part mp1 +mount -o ro /dev/md${u1}$part $mntpoint +mount -o union /dev/md${u2}$part $mntpoint -export RUNDIR=`pwd`/mp1/stressX +export RUNDIR=$mntpoint/stressX export runRUNTIME=10m -(cd ..; ./run.sh marcus.cfg) +(cd ..; ./run.sh marcus.cfg) > /dev/null umount /dev/md${u2}$part umount /dev/md${u1}$part @@ -66,5 +65,3 @@ mount | grep -q /dev/md${u1}$part && umo mdconfig -d -u $u2 mdconfig -d -u $u1 - -rm -rf mp1