Date: Wed, 24 May 2017 09:09:10 +0000 (UTC) From: Peter Holm <pho@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r318779 - user/pho/stress2/misc Message-ID: <201705240909.v4O99ACb018488@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pho Date: Wed May 24 09:09:10 2017 New Revision: 318779 URL: https://svnweb.freebsd.org/changeset/base/318779 Log: Fix more hard coded mount point names. Sponsored by: Dell EMC Isilon Modified: user/pho/stress2/misc/dangling.sh user/pho/stress2/misc/extattr.sh user/pho/stress2/misc/extattrctl.sh user/pho/stress2/misc/isofs3.sh user/pho/stress2/misc/md3.sh user/pho/stress2/misc/mlockall4.sh user/pho/stress2/misc/mmap29.sh user/pho/stress2/misc/overcommit2.sh user/pho/stress2/misc/quota9.sh user/pho/stress2/misc/sigxcpu.sh user/pho/stress2/misc/snap9.sh user/pho/stress2/misc/suj16.sh user/pho/stress2/misc/suj26.sh user/pho/stress2/misc/suj27.sh user/pho/stress2/misc/suj28.sh user/pho/stress2/misc/suj4.sh user/pho/stress2/misc/suj8.sh user/pho/stress2/misc/tmpfs14.sh user/pho/stress2/misc/unionfs.sh Modified: user/pho/stress2/misc/dangling.sh ============================================================================== --- user/pho/stress2/misc/dangling.sh Wed May 24 09:03:46 2017 (r318778) +++ user/pho/stress2/misc/dangling.sh Wed May 24 09:09:10 2017 (r318779) @@ -51,7 +51,7 @@ chmod 777 $mntpoint export runRUNTIME=4m export RUNDIR=$mntpoint/stressX -set `df -ik /mnt | tail -1 | awk '{print $4,$7}'` +set `df -ik $mntpoint | tail -1 | awk '{print $4,$7}'` export KBLOCKS=$(($1 / 4)) export INODES=$(($2 / 4)) Modified: user/pho/stress2/misc/extattr.sh ============================================================================== --- user/pho/stress2/misc/extattr.sh Wed May 24 09:03:46 2017 (r318778) +++ user/pho/stress2/misc/extattr.sh Wed May 24 09:09:10 2017 (r318779) @@ -60,7 +60,7 @@ cd $mntpoint/.attribute/system extattrctl initattr -p . 388 posix1e.acl_access extattrctl initattr -p . 388 posix1e.acl_default cd / -umount /mnt +umount $mntpoint tunefs -a enable /dev/md${mdstart}$part mount /dev/md${mdstart}$part $mntpoint mount | grep md${mdstart}$part Modified: user/pho/stress2/misc/extattrctl.sh ============================================================================== --- user/pho/stress2/misc/extattrctl.sh Wed May 24 09:03:46 2017 (r318778) +++ user/pho/stress2/misc/extattrctl.sh Wed May 24 09:09:10 2017 (r318779) @@ -60,7 +60,7 @@ cd $mntpoint/.attribute/system extattrctl initattr -p . 388 posix1e.acl_access extattrctl initattr -p . 388 posix1e.acl_default cd / -umount /mnt +umount $mntpoint tunefs -a enable /dev/md${mdstart}$part mount /dev/md${mdstart}$part $mntpoint mount | grep md${mdstart}$part Modified: user/pho/stress2/misc/isofs3.sh ============================================================================== --- user/pho/stress2/misc/isofs3.sh Wed May 24 09:03:46 2017 (r318778) +++ user/pho/stress2/misc/isofs3.sh Wed May 24 09:09:10 2017 (r318779) @@ -60,9 +60,9 @@ export RUNDIR=$mntpoint/stressX export runRUNTIME=5m (cd $mntpoint/stress2; ./run.sh marcus.cfg) > /dev/null -umount /mnt +umount $mntpoint mdconfig -d -u $m2 -umount /mnt +umount $mntpoint mdconfig -d -u $mdstart rm -rf $D $I exit 0 Modified: user/pho/stress2/misc/md3.sh ============================================================================== --- user/pho/stress2/misc/md3.sh Wed May 24 09:03:46 2017 (r318778) +++ user/pho/stress2/misc/md3.sh Wed May 24 09:09:10 2017 (r318779) @@ -44,7 +44,7 @@ newfs $newfs_flags md5$part > /dev/null mount /dev/md5$part $mntpoint # Stop FS "out of inodes" problem by only using 70% -set `df -ik /mnt | tail -1 | awk '{print $4,$7}'` +set `df -ik $mntpoint | tail -1 | awk '{print $4,$7}'` export KBLOCKS=$(($1 / 10 * 7)) export INODES=$(($2 / 10 * 7)) Modified: user/pho/stress2/misc/mlockall4.sh ============================================================================== --- user/pho/stress2/misc/mlockall4.sh Wed May 24 09:03:46 2017 (r318778) +++ user/pho/stress2/misc/mlockall4.sh Wed May 24 09:09:10 2017 (r318779) @@ -44,7 +44,7 @@ rm -f mlockall4.c mount | grep -q "on $mntpoint " && umount -f $mntpoint mount -t nullfs /tmp $mntpoint -/mnt/mlockall4 & +$mntpoint/mlockall4 & sleep 2 umount -f $mntpoint Modified: user/pho/stress2/misc/mmap29.sh ============================================================================== --- user/pho/stress2/misc/mmap29.sh Wed May 24 09:03:46 2017 (r318778) +++ user/pho/stress2/misc/mmap29.sh Wed May 24 09:09:10 2017 (r318779) @@ -19,7 +19,7 @@ bsdlabel -w md$mdstart auto newfs -U md${mdstart}$part > /dev/null mount /dev/md${mdstart}$part $mntpoint -mkdir /mnt/mmap29 +mkdir $mntpoint/mmap29 cd /tmp cat > mmap29.c <<EOFHERE #include <sys/param.h> @@ -60,7 +60,7 @@ EOFHERE cc -o mmap29 -Wall -Wextra -O0 -g mmap29.c || exit 1 rm mmap29.c -./mmap29 /mnt/mmap29/mmap291 +./mmap29 $mntpoint/mmap29/mmap291 old=`sysctl -n kern.maxvnodes` trap "sysctl kern.maxvnodes=$old" EXIT INT sysctl kern.maxvnodes=2000 Modified: user/pho/stress2/misc/overcommit2.sh ============================================================================== --- user/pho/stress2/misc/overcommit2.sh Wed May 24 09:03:46 2017 (r318778) +++ user/pho/stress2/misc/overcommit2.sh Wed May 24 09:09:10 2017 (r318779) @@ -57,7 +57,7 @@ echo "Expect: dd: /mnt/big.1: No space left on device" for i in `jot 10`; do - dd if=/dev/zero of=/mnt/big.$i bs=1m 2>&1 | \ + dd if=/dev/zero of=$mntpoint/big.$i bs=1m 2>&1 | \ egrep -v "records|transferred" & done wait Modified: user/pho/stress2/misc/quota9.sh ============================================================================== --- user/pho/stress2/misc/quota9.sh Wed May 24 09:03:46 2017 (r318778) +++ user/pho/stress2/misc/quota9.sh Wed May 24 09:09:10 2017 (r318779) @@ -73,7 +73,7 @@ if [ $# -eq 0 ]; then qc $mntpoint su $testuser $0 xxx - du -k /mnt/stressX + du -k $mntpoint/stressX qc $mntpoint Modified: user/pho/stress2/misc/sigxcpu.sh ============================================================================== --- user/pho/stress2/misc/sigxcpu.sh Wed May 24 09:03:46 2017 (r318778) +++ user/pho/stress2/misc/sigxcpu.sh Wed May 24 09:09:10 2017 (r318779) @@ -55,7 +55,7 @@ chmod 777 $mntpoint export runRUNTIME=4m export RUNDIR=$mntpoint/stressX -set `df -ik /mnt | tail -1 | awk '{print $4,$7}'` +set `df -ik $mntpoint | tail -1 | awk '{print $4,$7}'` export KBLOCKS=$(($1 / 4)) export INODES=$(($2 / 4)) Modified: user/pho/stress2/misc/snap9.sh ============================================================================== --- user/pho/stress2/misc/snap9.sh Wed May 24 09:03:46 2017 (r318778) +++ user/pho/stress2/misc/snap9.sh Wed May 24 09:09:10 2017 (r318779) @@ -63,6 +63,6 @@ rm $mntpoint/big.* rm -f $mntpoint/.snap/snap while mount | grep "$mntpoint" | grep -q md$mdstart; do - umount /mnt || sleep 1 + umount $mntpoint || sleep 1 done mdconfig -d -u $mdstart Modified: user/pho/stress2/misc/suj16.sh ============================================================================== --- user/pho/stress2/misc/suj16.sh Wed May 24 09:03:46 2017 (r318778) +++ user/pho/stress2/misc/suj16.sh Wed May 24 09:09:10 2017 (r318779) @@ -64,11 +64,11 @@ mntpoint2=${mntpoint}2 mount | grep $mntpoint2 | grep -q /dev/md && umount -f $mntpoint2 mdconfig -l | grep -q md$mdstart2 && mdconfig -d -u $mdstart2 while kill -0 $rpid 2> /dev/null; do - rm -f /mnt/.snap/suj16 - { mksnap_ffs /mnt /mnt/.snap/suj16 || continue; } 2>&1 | \ + rm -f $mntpoint/.snap/suj16 + { mksnap_ffs $mntpoint $mntpoint/.snap/suj16 || continue; } 2>&1 | \ grep -v "Resource temporarily unavailable" - [ ! -s /mnt/.snap/suj16 ] && continue - mdconfig -a -t vnode -f /mnt/.snap/suj16 -u $mdstart2 -o readonly + [ ! -s $mntpoint/.snap/suj16 ] && continue + mdconfig -a -t vnode -f $mntpoint/.snap/suj16 -u $mdstart2 -o readonly mount -r /dev/md$mdstart2 $mntpoint2 ls -l $mntpoint2 > /dev/null Modified: user/pho/stress2/misc/suj26.sh ============================================================================== --- user/pho/stress2/misc/suj26.sh Wed May 24 09:03:46 2017 (r318778) +++ user/pho/stress2/misc/suj26.sh Wed May 24 09:09:10 2017 (r318779) @@ -65,11 +65,11 @@ mntpoint2=${mntpoint}2 mount | grep $mntpoint2 | grep -q /dev/md && umount -f $mntpoint2 mdconfig -l | grep -q md$mdstart2 && mdconfig -d -u $mdstart2 while kill -0 $rpid 2> /dev/null; do - rm -f /mnt/.snap/suj26 - { mksnap_ffs /mnt /mnt/.snap/suj26 || continue; } 2>&1 | \ + rm -f $mntpoint/.snap/suj26 + { mksnap_ffs $mntpoint $mntpoint/.snap/suj26 || continue; } 2>&1 | \ grep -v "Resource temporarily unavailable" - [ ! -s /mnt/.snap/suj26 ] && continue - mdconfig -a -t vnode -f /mnt/.snap/suj26 -u $mdstart2 -o readonly + [ ! -s $mntpoint/.snap/suj26 ] && continue + mdconfig -a -t vnode -f $mntpoint/.snap/suj26 -u $mdstart2 -o readonly mount -r /dev/md$mdstart2 $mntpoint2 ls -l $mntpoint2 > /dev/null Modified: user/pho/stress2/misc/suj27.sh ============================================================================== --- user/pho/stress2/misc/suj27.sh Wed May 24 09:03:46 2017 (r318778) +++ user/pho/stress2/misc/suj27.sh Wed May 24 09:09:10 2017 (r318779) @@ -66,11 +66,11 @@ mntpoint2=${mntpoint}2 mount | grep $mntpoint2 | grep -q /dev/md && umount -f $mntpoint2 mdconfig -l | grep -q md$mdstart2 && mdconfig -d -u $mdstart2 while kill -0 $rpid 2> /dev/null; do - rm -f /mnt/.snap/suj27 - { mksnap_ffs /mnt /mnt/.snap/suj27 || continue; } 2>&1 | \ + rm -f $mntpoint/.snap/suj27 + { mksnap_ffs $mntpoint $mntpoint/.snap/suj27 || continue; } 2>&1 | \ grep -v "Resource temporarily unavailable" - [ ! -s /mnt/.snap/suj27 ] && continue - mdconfig -a -t vnode -f /mnt/.snap/suj27 -u $mdstart2 -o readonly + [ ! -s $mntpoint/.snap/suj27 ] && continue + mdconfig -a -t vnode -f $mntpoint/.snap/suj27 -u $mdstart2 -o readonly mount -r /dev/md$mdstart2 $mntpoint2 ls -l $mntpoint2 > /dev/null Modified: user/pho/stress2/misc/suj28.sh ============================================================================== --- user/pho/stress2/misc/suj28.sh Wed May 24 09:03:46 2017 (r318778) +++ user/pho/stress2/misc/suj28.sh Wed May 24 09:09:10 2017 (r318779) @@ -65,11 +65,11 @@ mntpoint2=${mntpoint}2 mount | grep $mntpoint2 | grep -q /dev/md && umount -f $mntpoint2 mdconfig -l | grep -q md$mdstart2 && mdconfig -d -u $mdstart2 while kill -0 $rpid 2> /dev/null; do - rm -f /mnt/.snap/suj28 - { mksnap_ffs /mnt /mnt/.snap/suj28 || continue; } 2>&1 | \ + rm -f $mntpoint/.snap/suj28 + { mksnap_ffs $mntpoint $mntpoint/.snap/suj28 || continue; } 2>&1 | \ grep -v "Resource temporarily unavailable" - [ ! -s /mnt/.snap/suj28 ] && continue - mdconfig -a -t vnode -f /mnt/.snap/suj28 -u $mdstart2 -o readonly + [ ! -s $mntpoint/.snap/suj28 ] && continue + mdconfig -a -t vnode -f $mntpoint/.snap/suj28 -u $mdstart2 -o readonly mount -r /dev/md$mdstart2 $mntpoint2 ls -l $mntpoint2 > /dev/null Modified: user/pho/stress2/misc/suj4.sh ============================================================================== --- user/pho/stress2/misc/suj4.sh Wed May 24 09:03:46 2017 (r318778) +++ user/pho/stress2/misc/suj4.sh Wed May 24 09:09:10 2017 (r318779) @@ -44,7 +44,7 @@ chmod 777 $mntpoint export RUNDIR=$mntpoint/stressX export runRUNTIME=30m -set `df -ik /mnt | tail -1 | awk '{print $4,$7}'` +set `df -ik $mntpoint | tail -1 | awk '{print $4,$7}'` export KBLOCKS=$(($1 / 2)) export INODES=$(($2 / 2)) export rwINCARNATIONS=10 Modified: user/pho/stress2/misc/suj8.sh ============================================================================== --- user/pho/stress2/misc/suj8.sh Wed May 24 09:03:46 2017 (r318778) +++ user/pho/stress2/misc/suj8.sh Wed May 24 09:09:10 2017 (r318779) @@ -50,7 +50,7 @@ for i in 1 2 ; do mount /dev/md${mdstart}$part $mntpoint - dd if=/dev/zero of=/mnt/big bs=4k > /dev/null 2>&1 + dd if=/dev/zero of=$mntpoint/big bs=4k > /dev/null 2>&1 while mount | grep $mntpoint | grep -q /dev/md; do umount $mntpoint || sleep 1 Modified: user/pho/stress2/misc/tmpfs14.sh ============================================================================== --- user/pho/stress2/misc/tmpfs14.sh Wed May 24 09:03:46 2017 (r318778) +++ user/pho/stress2/misc/tmpfs14.sh Wed May 24 09:09:10 2017 (r318779) @@ -45,7 +45,7 @@ rm -f tmpfs14.c cd $odir mount | grep -q "$mntpoint " && umount -f $mntpoint -mount -t tmpfs tmpfs /mnt +mount -t tmpfs tmpfs $mntpoint (cd $mntpoint; /tmp/tmpfs14) & Modified: user/pho/stress2/misc/unionfs.sh ============================================================================== --- user/pho/stress2/misc/unionfs.sh Wed May 24 09:03:46 2017 (r318778) +++ user/pho/stress2/misc/unionfs.sh Wed May 24 09:09:10 2017 (r318779) @@ -43,7 +43,7 @@ mdconfig -a -t vnode -f $diskimage -u $m bsdlabel -w md$mdstart auto newfs $newfs_flags md${mdstart}$part > /dev/null mount /dev/md${mdstart}$part $mntpoint -mount -t unionfs -o noatime /mnt /tmp +mount -t unionfs -o noatime $mntpoint /tmp export RUNDIR=/tmp/stressX export runRUNTIME=10m # Run tests for 10 minutes (cd ..; ./run.sh disk.cfg)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201705240909.v4O99ACb018488>