Date: Tue, 10 Dec 2013 11:45:39 +0000 (UTC) From: Peter Holm <pho@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r259166 - user/pho/stress2/misc Message-ID: <201312101145.rBABjdrF012930@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312101145.rBABjdrF012930>