From owner-svn-src-user@freebsd.org Thu May 4 12:19:01 2017 Return-Path: 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 A3C4CD5C855 for ; Thu, 4 May 2017 12:19:01 +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 795D5680; Thu, 4 May 2017 12:19:01 +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 v44CJ0de045334; Thu, 4 May 2017 12:19:00 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v44CIwA7045314; Thu, 4 May 2017 12:18:58 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201705041218.v44CIwA7045314@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Thu, 4 May 2017 12:18:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r317791 - 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.23 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: Thu, 04 May 2017 12:19:01 -0000 Author: pho Date: Thu May 4 12:18:58 2017 New Revision: 317791 URL: https://svnweb.freebsd.org/changeset/base/317791 Log: Style. Sponsored by: Dell EMC Isilon Modified: user/pho/stress2/misc/gnop.sh user/pho/stress2/misc/gnop2.sh user/pho/stress2/misc/gnop3.sh user/pho/stress2/misc/gnop4.sh user/pho/stress2/misc/graid1_5.sh user/pho/stress2/misc/maxmemdom.sh user/pho/stress2/misc/oovm.sh user/pho/stress2/misc/oovm2.sh user/pho/stress2/misc/suj12.sh user/pho/stress2/misc/suj3.sh user/pho/stress2/misc/vmio.sh user/pho/stress2/misc/zfs2.sh user/pho/stress2/misc/zfs3.sh user/pho/stress2/misc/zfs4.sh user/pho/stress2/misc/zfs5.sh Modified: user/pho/stress2/misc/gnop.sh ============================================================================== --- user/pho/stress2/misc/gnop.sh Thu May 4 11:57:52 2017 (r317790) +++ user/pho/stress2/misc/gnop.sh Thu May 4 12:18:58 2017 (r317791) @@ -42,8 +42,8 @@ test() { mdconfig -a -t swap -s 2g -u $mdstart || exit 1 gnop create -S $1 /dev/md$mdstart - newfs $newfs_flags /dev/md${mdstart}.nop > /dev/null - mount /dev/md${mdstart}.nop $mntpoint + newfs $newfs_flags /dev/md$mdstart.nop > /dev/null + mount /dev/md$mdstart.nop $mntpoint chmod 777 $mntpoint export runRUNTIME=4m @@ -54,8 +54,8 @@ test() { while mount | grep $mntpoint | grep -q /dev/md; do umount $mntpoint || sleep 1 done - checkfs /dev/md${mdstart}.nop - gnop destroy /dev/md${mdstart}.nop + checkfs /dev/md$mdstart.nop + gnop destroy /dev/md$mdstart.nop mdconfig -d -u $mdstart } Modified: user/pho/stress2/misc/gnop2.sh ============================================================================== --- user/pho/stress2/misc/gnop2.sh Thu May 4 11:57:52 2017 (r317790) +++ user/pho/stress2/misc/gnop2.sh Thu May 4 12:18:58 2017 (r317791) @@ -55,8 +55,8 @@ test() { mdconfig -a -t swap -s 2g -u $mdstart || exit 1 gnop create -S $1 /dev/md$mdstart - newfs $newfs_flags /dev/md${mdstart}.nop > /dev/null - mount /dev/md${mdstart}.nop $mntpoint + newfs $newfs_flags /dev/md$mdstart.nop > /dev/null + mount /dev/md$mdstart.nop $mntpoint chmod 777 $mntpoint dd if=/dev/zero of=$mntpoint/file bs=1k count=333 2>&1 | \ @@ -66,7 +66,7 @@ test() { while mount | grep $mntpoint | grep -q /dev/md; do umount $mntpoint || sleep 1 done - gnop destroy /dev/md${mdstart}.nop + gnop destroy /dev/md$mdstart.nop mdconfig -d -u $mdstart } Modified: user/pho/stress2/misc/gnop3.sh ============================================================================== --- user/pho/stress2/misc/gnop3.sh Thu May 4 11:57:52 2017 (r317790) +++ user/pho/stress2/misc/gnop3.sh Thu May 4 12:18:58 2017 (r317791) @@ -46,8 +46,8 @@ mount | grep $mntpoint | grep -q /dev/md mdconfig -a -t swap -s 8g -u $mdstart || exit 1 gnop create -S 8k /dev/md$mdstart -newfs $newfs_flags /dev/md${mdstart}.nop > /dev/null -mount /dev/md${mdstart}.nop $mntpoint +newfs $newfs_flags /dev/md$mdstart.nop > /dev/null +mount /dev/md$mdstart.nop $mntpoint chmod 777 $mntpoint cp -a ../../stress2 $mntpoint @@ -63,7 +63,7 @@ cd $here while mount | grep $mntpoint | grep -q /dev/md; do umount $mntpoint || sleep 1 done -gnop destroy /dev/md${mdstart}.nop +gnop destroy /dev/md$mdstart.nop mdconfig -d -u $mdstart [ $notloaded ] && gnop unload exit 0 Modified: user/pho/stress2/misc/gnop4.sh ============================================================================== --- user/pho/stress2/misc/gnop4.sh Thu May 4 11:57:52 2017 (r317790) +++ user/pho/stress2/misc/gnop4.sh Thu May 4 12:18:58 2017 (r317791) @@ -47,8 +47,8 @@ mount | grep $mntpoint | grep -q /dev/md mdconfig -a -t swap -s ${gigs}g -u $mdstart || exit 1 gnop create -S 8k /dev/md$mdstart -newfs $newfs_flags /dev/md${mdstart}.nop > /dev/null -mount /dev/md${mdstart}.nop $mntpoint +newfs $newfs_flags /dev/md$mdstart.nop > /dev/null +mount /dev/md$mdstart.nop $mntpoint chmod 777 $mntpoint start=`date '+%s'` @@ -69,7 +69,7 @@ cd / while mount | grep $mntpoint | grep -q /dev/md; do umount $mntpoint || sleep 1 done -gnop destroy /dev/md${mdstart}.nop +gnop destroy /dev/md$mdstart.nop mdconfig -d -u $mdstart [ $notloaded ] && gnop unload exit 0 Modified: user/pho/stress2/misc/graid1_5.sh ============================================================================== --- user/pho/stress2/misc/graid1_5.sh Thu May 4 11:57:52 2017 (r317790) +++ user/pho/stress2/misc/graid1_5.sh Thu May 4 12:18:58 2017 (r317791) @@ -62,7 +62,7 @@ gpart add -t freebsd-ufs -s 340m md$u3 ) > /dev/null gnop create md$u2 gnop create md$u3 -gmirror label test md${u1}p1 md${u2}.nopp1 md${u3}.nopp1 +gmirror label test md${u1}p1 md$u2.nopp1 md$u3.nopp1 [ -c /dev/mirror/test ] || exit 1 newfs /dev/mirror/test > /dev/null @@ -77,18 +77,18 @@ rm -rf /tmp/stressX.control su $testuser -c 'cd ..; ./run.sh marcus.cfg' > /dev/null 2>&1 & pid=$! -gnop configure -r 0 -w 1 md${u2}.nop -gnop configure -r 0 -w 1 md${u3}.nop +gnop configure -r 0 -w 1 md$u2.nop +gnop configure -r 0 -w 1 md$u3.nop while kill -0 $pid > /dev/null 2>&1; do - if ! gmirror status test | grep -q md${u2}.nopp1; then + if ! gmirror status test | grep -q md$u2.nopp1; then gmirror forget test - gmirror remove test md${u2}.nopp1 2>/dev/null - gmirror insert test md${u2}.nopp1 2>/dev/null + gmirror remove test md$u2.nopp1 2>/dev/null + gmirror insert test md$u2.nopp1 2>/dev/null fi - if ! gmirror status test | grep -q md${u3}.nopp1; then + if ! gmirror status test | grep -q md$u3.nopp1; then gmirror forget test - gmirror remove test md${u3}.nopp1 2>/dev/null - gmirror insert test md${u3}.nopp1 2>/dev/null + gmirror remove test md$u3.nopp1 2>/dev/null + gmirror insert test md$u3.nopp1 2>/dev/null fi sleep 1 done Modified: user/pho/stress2/misc/maxmemdom.sh ============================================================================== --- user/pho/stress2/misc/maxmemdom.sh Thu May 4 11:57:52 2017 (r317790) +++ user/pho/stress2/misc/maxmemdom.sh Thu May 4 12:18:58 2017 (r317791) @@ -38,8 +38,8 @@ [ `sysctl -n vm.ndomains` -eq 1 ] && exit 0 size=$((`sysctl -n hw.physmem` / 1024 / 1024)) need=$((size * 2)) -d1=${diskimage}.1 -d2=${diskimage}.2 +d1=$diskimage.1 +d2=$diskimage.2 rm -f $d1 $d2 [ `df -k $(dirname $diskimage) | tail -1 | awk '{print int($4 / 1024)'}` -lt \ $need ] && printf "Need %d MB on %s.\n" $need `dirname $diskimage` && exit Modified: user/pho/stress2/misc/oovm.sh ============================================================================== --- user/pho/stress2/misc/oovm.sh Thu May 4 11:57:52 2017 (r317790) +++ user/pho/stress2/misc/oovm.sh Thu May 4 12:18:58 2017 (r317791) @@ -45,8 +45,8 @@ size=$((`sysctl -n hw.physmem` / 1024 / echo "RAM should be capped to 4GB for this test." [ $size -gt $maxsize ] && size=$maxsize need=$((size * 2)) -d1=${diskimage}.1 -d2=${diskimage}.2 +d1=$diskimage.1 +d2=$diskimage.2 rm -f $d1 $d2 [ `df -k $(dirname $diskimage) | tail -1 | awk '{print int($4 / 1024)'}` -lt \ $need ] && printf "Need %d MB on %s.\n" $need `dirname $diskimage` && exit Modified: user/pho/stress2/misc/oovm2.sh ============================================================================== --- user/pho/stress2/misc/oovm2.sh Thu May 4 11:57:52 2017 (r317790) +++ user/pho/stress2/misc/oovm2.sh Thu May 4 12:18:58 2017 (r317791) @@ -41,10 +41,10 @@ maxsize=$((2 * 1024)) # Limit size due to runtime reasons size=$((`sysctl -n hw.physmem` / 1024 / 1024)) [ $size -gt $maxsize ] && size=$maxsize -d1=${diskimage}.1 -d2=${diskimage}.2 -d3=${diskimage}.3 -d4=${diskimage}.4 +d1=$diskimage.1 +d2=$diskimage.2 +d3=$diskimage.3 +d4=$diskimage.4 rm -f $d1 $d2 $d3 $d4 [ `df -k $(dirname $diskimage) | tail -1 | awk '{print int($4 / 1024)'}` -lt \ $size ] && printf "Need %d MB on %s.\n" $size `dirname $diskimage` && exit Modified: user/pho/stress2/misc/suj12.sh ============================================================================== --- user/pho/stress2/misc/suj12.sh Thu May 4 11:57:52 2017 (r317790) +++ user/pho/stress2/misc/suj12.sh Thu May 4 12:18:58 2017 (r317791) @@ -41,8 +41,8 @@ mdconfig -l | grep -q md$mdstart && mdc mdconfig -a -t swap -s 1g -u $mdstart || exit 1 gnop status || exit 1 gnop create -S 4k /dev/md$mdstart -newfs -j /dev/md${mdstart}.nop -mount /dev/md${mdstart}.nop $mntpoint +newfs -j /dev/md$mdstart.nop +mount /dev/md$mdstart.nop $mntpoint chmod 777 $mntpoint export runRUNTIME=20m @@ -53,7 +53,7 @@ su $testuser -c 'cd ..; ./run.sh marcus. while mount | grep $mntpoint | grep -q /dev/md; do umount $mntpoint || sleep 1 done -checkfs /dev/md${mdstart}.nop -gnop destroy /dev/md${mdstart}.nop +checkfs /dev/md$mdstart.nop +gnop destroy /dev/md$mdstart.nop gnop unload mdconfig -d -u $mdstart Modified: user/pho/stress2/misc/suj3.sh ============================================================================== --- user/pho/stress2/misc/suj3.sh Thu May 4 11:57:52 2017 (r317790) +++ user/pho/stress2/misc/suj3.sh Thu May 4 12:18:58 2017 (r317791) @@ -46,20 +46,20 @@ echo test | geli init -s 4096 -J - -K /t echo test | geli attach -j - -k /tmp/suj3.key /dev/md$mdstart newfs /dev/md$mdstart.eli > /dev/null -tunefs -j enable /dev/md${mdstart}.eli -mount /dev/md${mdstart}.eli $mntpoint +tunefs -j enable /dev/md$mdstart.eli +mount /dev/md$mdstart.eli $mntpoint chmod 777 $mntpoint export RUNDIR=$mntpoint/stressX export runRUNTIME=5m -mount | grep -q md${mdstart}.eli && \ +mount | grep -q md$mdstart.eli && \ su $testuser -c "cd ..; ./run.sh rw.cfg" while mount | grep $mntpoint | grep -q /dev/md; do umount $mntpoint || sleep 1 done -checkfs /dev/md${mdstart}.eli +checkfs /dev/md$mdstart.eli geli kill /dev/md$mdstart.eli mdconfig -d -u $mdstart rm -f /tmp/suj3.key Modified: user/pho/stress2/misc/vmio.sh ============================================================================== --- user/pho/stress2/misc/vmio.sh Thu May 4 11:57:52 2017 (r317790) +++ user/pho/stress2/misc/vmio.sh Thu May 4 12:18:58 2017 (r317791) @@ -46,8 +46,8 @@ [ `swapinfo | wc -l` -eq 1 ] || { swapoff -a; off=1; } size=$((`sysctl -n hw.physmem` / 1024 / 1024)) need=$((size * 2)) -d1=${diskimage}.1 -d2=${diskimage}.2 +d1=$diskimage.1 +d2=$diskimage.2 rm -f $d1 $d2 || exit 1 [ `df -k $(dirname $diskimage) | tail -1 | awk '{print int($4 / 1024)'}` \ -lt $need ] && Modified: user/pho/stress2/misc/zfs2.sh ============================================================================== --- user/pho/stress2/misc/zfs2.sh Thu May 4 11:57:52 2017 (r317790) +++ user/pho/stress2/misc/zfs2.sh Thu May 4 12:18:58 2017 (r317791) @@ -38,8 +38,8 @@ kldstat -v | grep -q zfs.ko || { kldload zfs.ko || exit 0; loaded=1; } -d1=${diskimage}.1 -d2=${diskimage}.2 +d1=$diskimage.1 +d2=$diskimage.2 dd if=/dev/zero of=$d1 bs=1m count=1k 2>&1 | egrep -v "records|transferred" dd if=/dev/zero of=$d2 bs=1m count=1k 2>&1 | egrep -v "records|transferred" Modified: user/pho/stress2/misc/zfs3.sh ============================================================================== --- user/pho/stress2/misc/zfs3.sh Thu May 4 11:57:52 2017 (r317790) +++ user/pho/stress2/misc/zfs3.sh Thu May 4 12:18:58 2017 (r317791) @@ -44,8 +44,8 @@ kldstat -v | grep -q zfs.ko || { kldload zfs.ko || exit 0; loaded=1; } -d1=${diskimage}.1 -d2=${diskimage}.2 +d1=$diskimage.1 +d2=$diskimage.2 dd if=/dev/zero of=$d1 bs=1m count=1k 2>&1 | egrep -v "records|transferred" dd if=/dev/zero of=$d2 bs=1m count=1k 2>&1 | egrep -v "records|transferred" Modified: user/pho/stress2/misc/zfs4.sh ============================================================================== --- user/pho/stress2/misc/zfs4.sh Thu May 4 11:57:52 2017 (r317790) +++ user/pho/stress2/misc/zfs4.sh Thu May 4 12:18:58 2017 (r317791) @@ -38,8 +38,8 @@ kldstat -v | grep -q zfs.ko || { kldload zfs.ko || exit 0; loaded=1; } -d1=${diskimage}.1 -d2=${diskimage}.2 +d1=$diskimage.1 +d2=$diskimage.2 dd if=/dev/zero of=$d1 bs=1m count=1k 2>&1 | egrep -v "records|transferred" dd if=/dev/zero of=$d2 bs=1m count=1k 2>&1 | egrep -v "records|transferred" Modified: user/pho/stress2/misc/zfs5.sh ============================================================================== --- user/pho/stress2/misc/zfs5.sh Thu May 4 11:57:52 2017 (r317790) +++ user/pho/stress2/misc/zfs5.sh Thu May 4 12:18:58 2017 (r317791) @@ -38,8 +38,8 @@ kldstat -v | grep -q zfs.ko || { kldload zfs.ko || exit 0; loaded=1; } -d1=${diskimage}.1 -d2=${diskimage}.2 +d1=$diskimage.1 +d2=$diskimage.2 dd if=/dev/zero of=$d1 bs=1m count=1k 2>&1 | egrep -v "records|transferred" dd if=/dev/zero of=$d2 bs=1m count=1k 2>&1 | egrep -v "records|transferred"