From owner-svn-src-user@FreeBSD.ORG  Tue Dec 10 11:43:18 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 C25DA323;
 Tue, 10 Dec 2013 11:43:18 +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 AF78D12F0;
 Tue, 10 Dec 2013 11:43:18 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBABhIR9012577;
 Tue, 10 Dec 2013 11:43:18 GMT (envelope-from pho@svn.freebsd.org)
Received: (from pho@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBABhIrY012576;
 Tue, 10 Dec 2013 11:43:18 GMT (envelope-from pho@svn.freebsd.org)
Message-Id: <201312101143.rBABhIrY012576@svn.freebsd.org>
From: Peter Holm <pho@FreeBSD.org>
Date: Tue, 10 Dec 2013 11:43:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r259165 - 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.17
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: Tue, 10 Dec 2013 11:43:18 -0000

Author: pho
Date: Tue Dec 10 11:43:18 2013
New Revision: 259165
URL: http://svnweb.freebsd.org/changeset/base/259165

Log:
  Some old improvements to the scenario, from when snapshots were enabled for
  SU+J.
  
  Sponsored by:	EMC / Isilon storage division

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

Modified: user/pho/stress2/misc/suj22.sh
==============================================================================
--- user/pho/stress2/misc/suj22.sh	Tue Dec 10 10:32:18 2013	(r259164)
+++ user/pho/stress2/misc/suj22.sh	Tue Dec 10 11:43:18 2013	(r259165)
@@ -55,10 +55,12 @@
 # }
 
 snap () {
-	while [ ! -s $2 ]; do
+	for i in `jot 5`; do
 		mksnap_ffs $1 $2 2>&1 | grep -v "Resource temporarily unavailable"
-		[ ! -s $2 ] && rm -f $2	# Get rid of zero size snapshots
+		[ ! -s $2 ] && rm -f $2	|| return 0
+		sleep 1
 	done
+	return 1
 }
 
 D=$diskimage
@@ -97,7 +99,7 @@ snap $mntpoint ${mntpoint}/.snap/snap2
 for i in `jot 10`; do
 	/tmp/suj22 prune
 	/tmp/suj22
-	snap $mntpoint ${mntpoint}/.snap/snap$((i + 2))
+	snap $mntpoint ${mntpoint}/.snap/snap$((i + 2)) || break
 	sn=`ls -tU ${mntpoint}/.snap | tail -1`
 	rm -f ${mntpoint}/.snap/$sn
 done
@@ -106,8 +108,10 @@ cd $here
 while mount | grep -q ${mntpoint}; do
 	umount ${mntpoint} || sleep 1
 done
+fsck -t ufs -y md${mdstart}${part}
+fsck -t ufs -y md${mdstart}${part}
 mdconfig -d -u ${mdstart}
-rm -f /tmp/suj22
+rm -f /tmp/suj22 $D
 exit 0
 EOF
 #include <sys/types.h>