From owner-svn-src-user@freebsd.org  Tue Sep 19 06:54:02 2017
Return-Path: <owner-svn-src-user@freebsd.org>
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 5B25AE26DBA
 for <svn-src-user@mailman.ysv.freebsd.org>;
 Tue, 19 Sep 2017 06:54:02 +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 28A7B6D3FA;
 Tue, 19 Sep 2017 06:54:02 +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 v8J6s1ED096740;
 Tue, 19 Sep 2017 06:54:01 GMT (envelope-from pho@FreeBSD.org)
Received: (from pho@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8J6s1cK096739;
 Tue, 19 Sep 2017 06:54:01 GMT (envelope-from pho@FreeBSD.org)
Message-Id: <201709190654.v8J6s1cK096739@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org
 using -f
From: Peter Holm <pho@FreeBSD.org>
Date: Tue, 19 Sep 2017 06:54:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r323730 - user/pho/stress2/misc
X-SVN-Group: user
X-SVN-Commit-Author: pho
X-SVN-Commit-Paths: user/pho/stress2/misc
X-SVN-Commit-Revision: 323730
X-SVN-Commit-Repository: base
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 &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 19 Sep 2017 06:54:02 -0000

Author: pho
Date: Tue Sep 19 06:54:01 2017
New Revision: 323730
URL: https://svnweb.freebsd.org/changeset/base/323730

Log:
  Improve error handling and return fsck(8) errors.
  
  Sponsored by:	Dell EMC Isilon

Modified:
  user/pho/stress2/misc/gnop.sh

Modified: user/pho/stress2/misc/gnop.sh
==============================================================================
--- user/pho/stress2/misc/gnop.sh	Tue Sep 19 06:46:00 2017	(r323729)
+++ user/pho/stress2/misc/gnop.sh	Tue Sep 19 06:54:01 2017	(r323730)
@@ -34,17 +34,20 @@
 # Out of VM seen:
 # https://people.freebsd.org/~pho/stress/log/gnop.txt
 
+flag=/tmp/gnop.sh.flag
 test() {
 	. ../default.cfg
 
+	set -e
 	mount | grep $mntpoint | grep -q /dev/md && umount -f $mntpoint
 	[ -c /dev/md$mdstart ] &&  mdconfig -d -u $mdstart
 
-	mdconfig -a -t swap -s 2g -u $mdstart || exit 1
+	mdconfig -a -t swap -s 2g -u $mdstart
 	gnop create -S $1 /dev/md$mdstart
 	newfs $newfs_flags /dev/md$mdstart.nop > /dev/null
 	mount /dev/md$mdstart.nop $mntpoint
 	chmod 777 $mntpoint
+	set +e
 
 	export runRUNTIME=4m
 	export RUNDIR=$mntpoint/stressX
@@ -54,7 +57,7 @@ test() {
 	while mount | grep $mntpoint | grep -q /dev/md; do
 		umount $mntpoint || sleep 1
 	done
-	checkfs /dev/md$mdstart.nop
+	checkfs /dev/md$mdstart.nop || touch $flag
 	gnop destroy /dev/md$mdstart.nop
 	mdconfig -d -u $mdstart
 }
@@ -68,4 +71,6 @@ for i in 1k 2k 4k 8k; do
 done
 
 [ $notloaded ] && gnop unload
-exit 0
+[ -f $flag ] && s=1 || s=0
+rm -f $flag
+exit $s