svn commit: r279171 - user/pho/stress2/misc

[Peter Holm]

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