From owner-svn-src-user@freebsd.org Tue May 2 10:06:47 2017 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E8B72D573F6 for ; Tue, 2 May 2017 10:06:47 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 AA71468F; Tue, 2 May 2017 10:06:47 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v42A6kB5091245; Tue, 2 May 2017 10:06:46 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v42A6kPm091242; Tue, 2 May 2017 10:06:46 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201705021006.v42A6kPm091242@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Tue, 2 May 2017 10:06:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r317676 - 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.23 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, 02 May 2017 10:06:48 -0000 Author: pho Date: Tue May 2 10:06:46 2017 New Revision: 317676 URL: https://svnweb.freebsd.org/changeset/base/317676 Log: Improve error handling. Sponsored by: Dell EMC Isilon Modified: user/pho/stress2/misc/graid0.sh user/pho/stress2/misc/graid1.sh user/pho/stress2/misc/graid3.sh Modified: user/pho/stress2/misc/graid0.sh ============================================================================== --- user/pho/stress2/misc/graid0.sh Tue May 2 07:28:01 2017 (r317675) +++ user/pho/stress2/misc/graid0.sh Tue May 2 10:06:46 2017 (r317676) @@ -47,7 +47,7 @@ for u in $md1 $md2 $md3; do mdconfig -a -t swap -s $size -u $u done -gstripe load > /dev/null 2>&1 +gstripe load > /dev/null 2>&1 && unload=1 gstripe label -v -s 131072 data /dev/md$md1 /dev/md$md2 /dev/md$md3 > \ /dev/null || exit 1 [ -c /dev/stripe/data ] || exit 1 @@ -62,9 +62,10 @@ su $testuser -c 'cd ..; ./run.sh marcus. while mount | grep $mntpoint | grep -q /stripe/; do umount $mntpoint || sleep 1 done -gstripe stop data -gstripe unload +gstripe stop data && s=0 || s=1 +[ $unload ] && gstripe unload for u in $md3 $md2 $md1; do mdconfig -d -u $u done +exit $s Modified: user/pho/stress2/misc/graid1.sh ============================================================================== --- user/pho/stress2/misc/graid1.sh Tue May 2 07:28:01 2017 (r317675) +++ user/pho/stress2/misc/graid1.sh Tue May 2 10:06:46 2017 (r317676) @@ -38,6 +38,7 @@ md1=$mdstart md2=$((mdstart + 1)) md3=$((mdstart + 2)) +s=0 size=1g [ $((`sysctl -n hw.usermem` / 1024 / 1024 / 1024)) -le 4 ] && size=512m @@ -47,7 +48,7 @@ for u in $md1 $md2 $md3; do mdconfig -a -t swap -s $size -u $u done -gmirror load > /dev/null 2>&1 +gmirror load > /dev/null 2>&1 && unload=1 gmirror label -v -b split -s 2048 data /dev/md$md1 /dev/md$md2 \ /dev/md$md3 > /dev/null || exit 1 [ -c /dev/mirror/data ] || exit 1 @@ -62,9 +63,11 @@ su $testuser -c 'cd ..; ./run.sh marcus. while mount | grep $mntpoint | grep -q /mirror/; do umount $mntpoint || sleep 1 done -gmirror stop data -gmirror unload +gmirror stop data || s=1 +gmirror destroy data 2>/dev/null +[ $unload ] && gmirror unload for u in $md3 $md2 $md1; do - mdconfig -d -u $u + mdconfig -d -u $u || s=3 done +exit $s Modified: user/pho/stress2/misc/graid3.sh ============================================================================== --- user/pho/stress2/misc/graid3.sh Tue May 2 07:28:01 2017 (r317675) +++ user/pho/stress2/misc/graid3.sh Tue May 2 10:06:46 2017 (r317676) @@ -48,7 +48,7 @@ for u in $md1 $md2 $md3; do mdconfig -a -t swap -s $size -u $u done -graid3 load > /dev/null 2>&1 +graid3 load > /dev/null 2>&1 && unload=1 graid3 label -v -r data md$md1 md$md2 md$md3 > /dev/null || exit 1 [ -c /dev/raid3/data ] || exit 1 newfs $newfs_flags /dev/raid3/data > /dev/null @@ -64,9 +64,10 @@ while mount | grep $mntpoint | grep -q r umount $mntpoint || sleep 1 done -graid3 stop data -graid3 unload +graid3 stop data && s=0 || s=1 +[ $unload ] && graid3 unload for u in $md3 $md2 $md1; do mdconfig -d -u $u done +exit $s