From owner-svn-src-user@freebsd.org  Tue Mar 13 12:38:27 2018
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:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3CB94F4A7D8
 for <svn-src-user@mailman.ysv.freebsd.org>;
 Tue, 13 Mar 2018 12:38:27 +0000 (UTC) (envelope-from pho@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id DFA887B071;
 Tue, 13 Mar 2018 12:38:26 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DA8D419F40;
 Tue, 13 Mar 2018 12:38:26 +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 w2DCcQkJ089064;
 Tue, 13 Mar 2018 12:38:26 GMT (envelope-from pho@FreeBSD.org)
Received: (from pho@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2DCcQ0g089063;
 Tue, 13 Mar 2018 12:38:26 GMT (envelope-from pho@FreeBSD.org)
Message-Id: <201803131238.w2DCcQ0g089063@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, 13 Mar 2018 12:38:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r330841 - 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: 330841
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.25
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, 13 Mar 2018 12:38:27 -0000

Author: pho
Date: Tue Mar 13 12:38:26 2018
New Revision: 330841
URL: https://svnweb.freebsd.org/changeset/base/330841

Log:
  Do not loop forever on an umount failure. Return fsck status code.
  
  Sponsored by:	Dell EMC Isilon

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

Modified: user/pho/stress2/misc/full.sh
==============================================================================
--- user/pho/stress2/misc/full.sh	Tue Mar 13 12:35:37 2018	(r330840)
+++ user/pho/stress2/misc/full.sh	Tue Mar 13 12:38:26 2018	(r330841)
@@ -57,8 +57,12 @@ export TESTPROGS=`cd ..; find testcases/ -perm -1 -typ
 su $testuser -c 'cd ..; ./testcases/run/run $TESTPROGS'
 
 ../tools/killall.sh
-while mount | grep "on $mntpoint " | grep -q /dev/md; do
-	umount $mntpoint || sleep 1
+for i in `jot 6`; do
+	mount | grep -q "on $mntpoint " || break
+	umount $mntpoint && break || sleep 10
+	[ $i -eq 6 ] &&
+	    { echo FATAL; fstat -mf $mntpoint; exit 1; }
 done
-checkfs /dev/md${mdstart}$part
+checkfs /dev/md${mdstart}$part; s=$?
 mdconfig -d -u $mdstart
+return $s