From owner-svn-src-user@FreeBSD.ORG Tue Feb 17 09:40:38 2015 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9B5C130A; Tue, 17 Feb 2015 09:40:38 +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 6D8B084F; Tue, 17 Feb 2015 09:40:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1H9ec5n005101; Tue, 17 Feb 2015 09:40:38 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1H9eboV005097; Tue, 17 Feb 2015 09:40:37 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201502170940.t1H9eboV005097@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Tue, 17 Feb 2015 09:40:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r278893 - 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: Tue, 17 Feb 2015 09:40:38 -0000 Author: pho Date: Tue Feb 17 09:40:36 2015 New Revision: 278893 URL: https://svnweb.freebsd.org/changeset/base/278893 Log: Fix whitespace, limit runtime and user $testuser. Sponsored by: EMC / Isilon storage division Modified: user/pho/stress2/misc/quota1.sh user/pho/stress2/misc/quota10.sh user/pho/stress2/misc/quota5.sh Modified: user/pho/stress2/misc/quota1.sh ============================================================================== --- user/pho/stress2/misc/quota1.sh Tue Feb 17 09:34:48 2015 (r278892) +++ user/pho/stress2/misc/quota1.sh Tue Feb 17 09:40:36 2015 (r278893) @@ -48,7 +48,7 @@ newfs $newfs_flags md${mdstart}$part > mount /dev/md${mdstart}$part $mntpoint export RUNDIR=${mntpoint}/stressX export runRUNTIME=10m # Run tests for 10 minutes -(cd ..; ./run.sh disk.cfg) +(cd ..; ./run.sh disk.cfg) while mount | grep -q $mntpoint; do umount $mntpoint > /dev/null 2>&1 || sleep 1 done Modified: user/pho/stress2/misc/quota10.sh ============================================================================== --- user/pho/stress2/misc/quota10.sh Tue Feb 17 09:34:48 2015 (r278892) +++ user/pho/stress2/misc/quota10.sh Tue Feb 17 09:40:36 2015 (r278893) @@ -88,7 +88,7 @@ else else # The test: Parallel mount and unmounts - for i in `jot 1024`; do + for i in `jot 1000`; do m=$1 opt=`[ $(( m % 2 )) -eq 0 ] && echo -f` mount $opt /dev/md${m}${part} ${mntpoint}$m Modified: user/pho/stress2/misc/quota5.sh ============================================================================== --- user/pho/stress2/misc/quota5.sh Tue Feb 17 09:34:48 2015 (r278892) +++ user/pho/stress2/misc/quota5.sh Tue Feb 17 09:40:36 2015 (r278893) @@ -30,15 +30,16 @@ [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 +mount | grep -q "on /tmp (ufs," || exit 0 if ! grep /tmp /etc/fstab | grep -q quota ; then echo "/tmp must have quota enabled!" exit 2 -fi -edquota -u -f /tmp -e /tmp:1500000:1400000:200000:180000 pho -edquota -g -f /tmp -e /tmp:1500000:1400000:200000:180000 pho +fi +edquota -u -f /tmp -e /tmp:1500000:1400000:200000:180000 $testuser +edquota -g -f /tmp -e /tmp:1500000:1400000:200000:180000 $testuser quotaon /tmp -#su pho -c "export runRUNTIME=60m; cd /home/pho/stress2; ./run.sh disk.cfg" -su pho -c "export runRUNTIME=60m; cd ..; ./mkdir -t 1h -i 200 -v -v" +su $testuser -c "export runRUNTIME=60m; cd ../testcases/mkdir; \ + ./mkdir -t 30m -i 200 -v -v" quotaoff /tmp