From owner-svn-src-user@FreeBSD.ORG  Sun Nov 24 09:59:48 2013
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 41535987;
 Sun, 24 Nov 2013 09:59:48 +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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 3164F29A0;
 Sun, 24 Nov 2013 09:59:48 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAO9xlHT008067;
 Sun, 24 Nov 2013 09:59:47 GMT (envelope-from pho@svn.freebsd.org)
Received: (from pho@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAO9xlJV008066;
 Sun, 24 Nov 2013 09:59:47 GMT (envelope-from pho@svn.freebsd.org)
Message-Id: <201311240959.rAO9xlJV008066@svn.freebsd.org>
From: Peter Holm <pho@FreeBSD.org>
Date: Sun, 24 Nov 2013 09:59:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r258522 - 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.16
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 24 Nov 2013 09:59:48 -0000

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.?