From owner-svn-src-user@FreeBSD.ORG Fri May 30 06:26:31 2014 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0CF0481B; Fri, 30 May 2014 06:26:31 +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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D53D423C9; Fri, 30 May 2014 06:26:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4U6QUTV073449; Fri, 30 May 2014 06:26:30 GMT (envelope-from pho@svn.freebsd.org) Received: (from pho@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4U6QUZH073448; Fri, 30 May 2014 06:26:30 GMT (envelope-from pho@svn.freebsd.org) Message-Id: <201405300626.s4U6QUZH073448@svn.freebsd.org> From: Peter Holm Date: Fri, 30 May 2014 06:26:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r266869 - 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.18 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: Fri, 30 May 2014 06:26:31 -0000 Author: pho Date: Fri May 30 06:26:30 2014 New Revision: 266869 URL: http://svnweb.freebsd.org/changeset/base/266869 Log: Make test less verbose and clean up code a bit. Sponsored by: EMC / Isilon storage division Modified: user/pho/stress2/misc/linger2.sh Modified: user/pho/stress2/misc/linger2.sh ============================================================================== --- user/pho/stress2/misc/linger2.sh Fri May 30 05:17:14 2014 (r266868) +++ user/pho/stress2/misc/linger2.sh Fri May 30 06:26:30 2014 (r266869) @@ -47,20 +47,20 @@ mdconfig -a -t swap -s 1g -u $mdstart bsdlabel -w md$mdstart auto [ $# -eq 1 ] && opt="$1" [ $# -eq 0 ] && opt=$newfs_flags # No argument == default flag -echo "newfs $opt md${mdstart}$part" -newfs $opt md${mdstart}$part > /dev/null +newfs $opt -n md${mdstart}$part > /dev/null mount /dev/md${mdstart}$part $mntpoint chmod 777 $mntpoint +set `df -i $mntpoint | tail -1 | awk '{print $3, $6}'` min=24 [ -r $mntpoint/.sujournal ] && { size=88; min=8232; } -if ! su ${testuser} -c "cd $mntpoint; /tmp/linger2 $size"; then - ls -lR $mntpoint +if ! su ${testuser} -c "cd $mntpoint; /tmp/linger2 $size 2>/dev/null"; then r=`df -i $mntpoint | head -1` echo " $r" - for i in `jot 10`; do + for i in `jot 12`; do r=`df -ik $mntpoint | tail -1` - echo "`date '+%T'` $r" + [ "$r" != "$old" ] && echo "`date '+%T'` $r" + old=$r [ `echo $r | awk '{print $3}'` -le $min ] && break sleep 10 done @@ -131,7 +131,7 @@ test(void) sprintf(file,"p%05d.%05d", pid, i); if (unlink(file) == -1) warn("unlink(%s)", file); - + } return (error); } @@ -157,7 +157,7 @@ main(int argc, char **argv) if ((fd = open("rendezvous", O_CREAT, 0644)) == -1) err(1, "open()"); close(fd); - + for (j = 0; j < PARALLEL; j++) { wait(&status); error += status; @@ -165,10 +165,8 @@ main(int argc, char **argv) unlink("rendezvous"); if (access("continue", R_OK) == -1) { - fprintf(stderr, "Loop #%d\n", i + 1); break; } -// sleep(60); /* Debug */ } unlink("continue");