Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 24 Nov 2013 09:59:47 +0000 (UTC)
From:      Peter Holm <pho@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-user@freebsd.org
Subject:   svn commit: r258522 - user/pho/stress2/misc
Message-ID:  <201311240959.rAO9xlJV008066@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: pho
Date: Sun Nov 24 09:59:47 2013
New Revision: 258522
URL: http://svnweb.freebsd.org/changeset/base/258522

Log:
  No need to use tunefs(8). Use file system check defined in default.cfg and
  trim run time.

Modified:
  user/pho/stress2/misc/trim3.sh

Modified: user/pho/stress2/misc/trim3.sh
==============================================================================
--- user/pho/stress2/misc/trim3.sh	Sun Nov 24 09:56:21 2013	(r258521)
+++ user/pho/stress2/misc/trim3.sh	Sun Nov 24 09:59:47 2013	(r258522)
@@ -41,21 +41,18 @@ mdconfig -l | grep -q md$mdstart &&  mdc
 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 swap -s $size -u $mdstart"
 	mdconfig -a -t swap -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
 
-	export runRUNTIME=10m
+	export runRUNTIME=7m
 	export RUNDIR=$mntpoint/stressX
 
 	su $testuser -c 'cd ..; ./run.sh marcus.cfg' > /dev/null 2>&1
@@ -63,12 +60,6 @@ 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.?



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311240959.rAO9xlJV008066>