svn commit: r253765 - user/pho/stress2/misc
Peter Holm
pho at FreeBSD.org
Mon Jul 29 10:14:18 UTC 2013
Author: pho
Date: Mon Jul 29 10:14:17 2013
New Revision: 253765
URL: http://svnweb.freebsd.org/changeset/base/253765
Log:
Set md_malloc_wait to 1 before test and enable SU+J in newfs(8).
Sponsored by: EMC / Isilon storage division
Modified:
user/pho/stress2/misc/trim.sh
Modified: user/pho/stress2/misc/trim.sh
==============================================================================
--- user/pho/stress2/misc/trim.sh Mon Jul 29 08:32:13 2013 (r253764)
+++ user/pho/stress2/misc/trim.sh Mon Jul 29 10:14:17 2013 (r253765)
@@ -34,8 +34,8 @@
. ../default.cfg
-[ "`sysctl vm.md_malloc_wait | awk '{print $NF}'`" != "1" ] && \
- echo "sysctl vm.md_malloc_wait should be set to 1"
+malloc_wait=`sysctl vm.md_malloc_wait | awk {'print $NF}'`
+[ $malloc_wait != 1 ] && sysctl vm.md_malloc_wait=1
mount | grep $mntpoint | grep -q /dev/md && umount -f $mntpoint
mdconfig -l | grep -q md$mdstart && mdconfig -d -u $mdstart
@@ -43,17 +43,13 @@ size="128m"
[ `uname -m` = "amd64" ] && size="1g"
[ $# -eq 0 ] && trim=-t
n=0
-for flag in '' '-U' '-U'; do
- n=$((n + 1))
+for flag in '' '-U' '-j'; do
echo "mdconfig -a -t malloc -o reserve -s $size -u $mdstart"
mdconfig -a -t malloc -o reserve -s $size -u $mdstart || exit 1
bsdlabel -w md$mdstart auto
echo "newfs $trim $flag md${mdstart}$part"
newfs $trim $flag md${mdstart}$part > /dev/null
- [ $n -eq 3 ] && tunefs -? 2>&1 | grep -q "j enable" && \
- tunefs -j enable /dev/md${mdstart}$part
-
mount /dev/md${mdstart}$part $mntpoint
chmod 777 $mntpoint
@@ -65,12 +61,8 @@ for flag in '' '-U' '-U'; do
while mount | grep $mntpoint | grep -q /dev/md; do
umount $mntpoint || sleep 1
done
- dumpfs /dev/md${mdstart}$part > /tmp/dumpfs.1
- sleep 1
- fsck -t ufs -y /dev/md${mdstart}$part > /tmp/fsck.log 2>&1
- dumpfs /dev/md${mdstart}$part > /tmp/dumpfs.2
-
- diff -c /tmp/dumpfs.1 /tmp/dumpfs.2 || cat /tmp/fsck.log
+ checkfs /dev/md${mdstart}$part
mdconfig -d -u $mdstart
done
-rm -f /tmp/fsck.log /tmp/dumpfs.?
+rm -f /tmp/fsck.log
+[ $malloc_wait != 1 ] && sysctl vm.md_malloc_wait=$malloc_wait
More information about the svn-src-user
mailing list