From owner-svn-src-user@FreeBSD.ORG Sun Feb 22 18:04:34 2015 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6F3C171E; Sun, 22 Feb 2015 18:04:34 +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 3F944FA2; Sun, 22 Feb 2015 18:04:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1MI4XWD073693; Sun, 22 Feb 2015 18:04:33 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1MI4XTb073690; Sun, 22 Feb 2015 18:04:33 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201502221804.t1MI4XTb073690@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Sun, 22 Feb 2015 18:04:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r279171 - 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-1 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: Sun, 22 Feb 2015 18:04:34 -0000 Author: pho Date: Sun Feb 22 18:04:32 2015 New Revision: 279171 URL: https://svnweb.freebsd.org/changeset/base/279171 Log: Handle graid not being available. Sponsored by: EMC / Isilon storage division 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 Sun Feb 22 17:50:39 2015 (r279170) +++ user/pho/stress2/misc/graid0.sh Sun Feb 22 18:04:32 2015 (r279171) @@ -43,9 +43,10 @@ for u in $md1 $md2 $md3; do mdconfig -a -t swap -s 1g -u $u done -gstripe load || exit 1 +gstripe load > /dev/null 2>&1 gstripe label -v -s 131072 data /dev/md$md1 /dev/md$md2 /dev/md$md3 > \ - /dev/null + /dev/null || exit 1 +[ -c /dev/stripe/data ] || exit 1 newfs $newfs_flags /dev/stripe/data > /dev/null mount /dev/stripe/data $mntpoint chmod 777 $mntpoint Modified: user/pho/stress2/misc/graid1.sh ============================================================================== --- user/pho/stress2/misc/graid1.sh Sun Feb 22 17:50:39 2015 (r279170) +++ user/pho/stress2/misc/graid1.sh Sun Feb 22 18:04:32 2015 (r279171) @@ -43,9 +43,10 @@ for u in $md1 $md2 $md3; do mdconfig -a -t swap -s 1g -u $u done -gmirror load || exit 1 +gmirror load > /dev/null 2>&1 gmirror label -v -b split -s 2048 data /dev/md$md1 /dev/md$md2 \ - /dev/md$md3 > /dev/null + /dev/md$md3 > /dev/null || exit 1 +[ -c /dev/mirror/data ] || exit 1 newfs $newfs_flags /dev/mirror/data > /dev/null mount /dev/mirror/data $mntpoint chmod 777 $mntpoint Modified: user/pho/stress2/misc/graid3.sh ============================================================================== --- user/pho/stress2/misc/graid3.sh Sun Feb 22 17:50:39 2015 (r279170) +++ user/pho/stress2/misc/graid3.sh Sun Feb 22 18:04:32 2015 (r279171) @@ -44,8 +44,9 @@ for u in $md1 $md2 $md3; do mdconfig -a -t swap -s 1g -u $u done -graid3 load || exit -graid3 label -v -r data md$md1 md$md2 md$md3 > /dev/null || exit +graid3 load > /dev/null 2>&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 mount /dev/raid3/data $mntpoint chmod 777 $mntpoint