From owner-svn-src-user@FreeBSD.ORG Mon Jul 29 10:14:17 2013 Return-Path: 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 ESMTP id E41EE136; Mon, 29 Jul 2013 10:14:17 +0000 (UTC) (envelope-from pho@FreeBSD.org) 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 B9B682B54; Mon, 29 Jul 2013 10:14:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6TAEHAM037538; Mon, 29 Jul 2013 10:14:17 GMT (envelope-from pho@svn.freebsd.org) Received: (from pho@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6TAEHRg037537; Mon, 29 Jul 2013 10:14:17 GMT (envelope-from pho@svn.freebsd.org) Message-Id: <201307291014.r6TAEHRg037537@svn.freebsd.org> From: Peter Holm Date: Mon, 29 Jul 2013 10:14:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r253765 - 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.14 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: Mon, 29 Jul 2013 10:14:18 -0000 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