Date: Thu, 27 Apr 2017 07:49:33 +0000 (UTC) From: Peter Holm <pho@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r317492 - user/pho/stress2/misc Message-ID: <201704270749.v3R7nXDj037498@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pho Date: Thu Apr 27 07:49:33 2017 New Revision: 317492 URL: https://svnweb.freebsd.org/changeset/base/317492 Log: If "gnop status" fail, return 1. Sponsored by: Dell EMC Isilon Modified: user/pho/stress2/misc/gnop.sh user/pho/stress2/misc/gnop2.sh user/pho/stress2/misc/gnop3.sh user/pho/stress2/misc/gnop4.sh user/pho/stress2/misc/graid1_5.sh user/pho/stress2/misc/graid1_7.sh user/pho/stress2/misc/suj12.sh Modified: user/pho/stress2/misc/gnop.sh ============================================================================== --- user/pho/stress2/misc/gnop.sh Thu Apr 27 07:44:47 2017 (r317491) +++ user/pho/stress2/misc/gnop.sh Thu Apr 27 07:49:33 2017 (r317492) @@ -61,7 +61,7 @@ test() { kldstat | grep -q geom_nop || { gnop load 2>/dev/null || exit 0 && notloaded=1; } -gnop status || exit +gnop status || exit 1 for i in 1k 2k 4k 8k; do test $i Modified: user/pho/stress2/misc/gnop2.sh ============================================================================== --- user/pho/stress2/misc/gnop2.sh Thu Apr 27 07:44:47 2017 (r317491) +++ user/pho/stress2/misc/gnop2.sh Thu Apr 27 07:49:33 2017 (r317492) @@ -70,7 +70,7 @@ test() { mdconfig -d -u $mdstart } -gnop status || exit +gnop status || exit 1 for i in 1k 2k 4k 8k; do test $i Modified: user/pho/stress2/misc/gnop3.sh ============================================================================== --- user/pho/stress2/misc/gnop3.sh Thu Apr 27 07:44:47 2017 (r317491) +++ user/pho/stress2/misc/gnop3.sh Thu Apr 27 07:49:33 2017 (r317492) @@ -39,7 +39,7 @@ kldstat | grep -q geom_nop || { gnop load 2>/dev/null || exit 0 && notloaded=1; } -gnop status || exit +gnop status || exit 1 mount | grep $mntpoint | grep -q /dev/md && umount -f $mntpoint [ -c /dev/md$mdstart ] && mdconfig -d -u $mdstart Modified: user/pho/stress2/misc/gnop4.sh ============================================================================== --- user/pho/stress2/misc/gnop4.sh Thu Apr 27 07:44:47 2017 (r317491) +++ user/pho/stress2/misc/gnop4.sh Thu Apr 27 07:49:33 2017 (r317492) @@ -40,7 +40,7 @@ gigs=9 kldstat | grep -q geom_nop || { gnop load 2>/dev/null || exit 0 && notloaded=1; } -gnop status || exit +gnop status || exit 1 mount | grep $mntpoint | grep -q /dev/md && umount -f $mntpoint [ -c /dev/md$mdstart ] && mdconfig -d -u $mdstart Modified: user/pho/stress2/misc/graid1_5.sh ============================================================================== --- user/pho/stress2/misc/graid1_5.sh Thu Apr 27 07:44:47 2017 (r317491) +++ user/pho/stress2/misc/graid1_5.sh Thu Apr 27 07:49:33 2017 (r317492) @@ -42,7 +42,7 @@ old=`sysctl -n kern.geom.mirror.debug` sysctl kern.geom.mirror.debug=-1 | grep -q -- -1 || sysctl kern.geom.mirror.debug=$old > /dev/null kldstat | grep -q geom_nop || { gnop load 2>/dev/null || exit 0; } -gnop status || exit 0 +gnop status || exit 1 u1=$mdstart u2=$((mdstart + 1)) Modified: user/pho/stress2/misc/graid1_7.sh ============================================================================== --- user/pho/stress2/misc/graid1_7.sh Thu Apr 27 07:44:47 2017 (r317491) +++ user/pho/stress2/misc/graid1_7.sh Thu Apr 27 07:49:33 2017 (r317492) @@ -42,7 +42,7 @@ old=`sysctl -n kern.geom.mirror.debug` sysctl kern.geom.mirror.debug=-1 | grep -q -- -1 || sysctl kern.geom.mirror.debug=$old > /dev/null kldstat | grep -q geom_nop || { gnop load 2>/dev/null || exit 0; } -gnop status || exit 0 +gnop status || exit 1 u1=$mdstart s=0 Modified: user/pho/stress2/misc/suj12.sh ============================================================================== --- user/pho/stress2/misc/suj12.sh Thu Apr 27 07:44:47 2017 (r317491) +++ user/pho/stress2/misc/suj12.sh Thu Apr 27 07:49:33 2017 (r317492) @@ -34,11 +34,12 @@ . ../default.cfg +gnop load || exit 0 mount | grep $mntpoint | grep -q /dev/md && umount -f $mntpoint mdconfig -l | grep -q md$mdstart && mdconfig -d -u $mdstart mdconfig -a -t swap -s 1g -u $mdstart || exit 1 -gnop load +gnop status || exit 1 gnop create -S 4k /dev/md$mdstart newfs -j /dev/md${mdstart}.nop mount /dev/md${mdstart}.nop $mntpoint
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201704270749.v3R7nXDj037498>