From owner-svn-src-user@FreeBSD.ORG Tue Dec 10 11:45:40 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 ESMTPS id 5036F44F; Tue, 10 Dec 2013 11:45:40 +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 235E31328; Tue, 10 Dec 2013 11:45:40 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBABjenM012933; Tue, 10 Dec 2013 11:45:40 GMT (envelope-from pho@svn.freebsd.org) Received: (from pho@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBABjdrF012930; Tue, 10 Dec 2013 11:45:39 GMT (envelope-from pho@svn.freebsd.org) Message-Id: <201312101145.rBABjdrF012930@svn.freebsd.org> From: Peter Holm Date: Tue, 10 Dec 2013 11:45:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r259166 - 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 " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Dec 2013 11:45:40 -0000 Author: pho Date: Tue Dec 10 11:45:39 2013 New Revision: 259166 URL: http://svnweb.freebsd.org/changeset/base/259166 Log: Old improvements to SU+J snapshot scenarios. Sponsored by: EMC / Isilon storage division Modified: user/pho/stress2/misc/suj19.sh user/pho/stress2/misc/suj20.sh user/pho/stress2/misc/suj21.sh Modified: user/pho/stress2/misc/suj19.sh ============================================================================== --- user/pho/stress2/misc/suj19.sh Tue Dec 10 11:43:18 2013 (r259165) +++ user/pho/stress2/misc/suj19.sh Tue Dec 10 11:45:39 2013 (r259166) @@ -35,10 +35,12 @@ . ../default.cfg 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 } mount | grep "${mntpoint}" | grep -q md${mdstart} && umount ${mntpoint} @@ -61,7 +63,7 @@ su ${testuser} -c 'sh -c "(cd ..;runRUNT for i in `jot 20`; do echo "`date '+%T'` mksnap_ffs ${mntpoint} ${mntpoint}/.snap/snap$i" - snap ${mntpoint} ${mntpoint}/.snap/snap$i + snap ${mntpoint} ${mntpoint}/.snap/snap$i || break sleep 1 done i=$(($(date '+%S') % 20 + 1)) Modified: user/pho/stress2/misc/suj20.sh ============================================================================== --- user/pho/stress2/misc/suj20.sh Tue Dec 10 11:43:18 2013 (r259165) +++ user/pho/stress2/misc/suj20.sh Tue Dec 10 11:45:39 2013 (r259166) @@ -51,10 +51,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 } here=`pwd` @@ -105,7 +107,7 @@ EOF static char buf[4096]; #define ND 100 -#define NF 500 +#define NF 100 void setup(void) Modified: user/pho/stress2/misc/suj21.sh ============================================================================== --- user/pho/stress2/misc/suj21.sh Tue Dec 10 11:43:18 2013 (r259165) +++ user/pho/stress2/misc/suj21.sh Tue Dec 10 11:45:39 2013 (r259166) @@ -52,10 +52,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 } here=`pwd` @@ -106,7 +108,7 @@ EOF static char buf[4096]; #define ND 100 -#define NF 500 +#define NF 100 void setup(void)