From owner-svn-src-user@freebsd.org  Fri Sep  9 08:50:13 2016
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 16285BD288D
 for <svn-src-user@mailman.ysv.freebsd.org>;
 Fri,  9 Sep 2016 08:50:13 +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 DA5D96D5;
 Fri,  9 Sep 2016 08:50:12 +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 u898oCcZ088644;
 Fri, 9 Sep 2016 08:50:12 GMT (envelope-from pho@FreeBSD.org)
Received: (from pho@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u898oCjt088643;
 Fri, 9 Sep 2016 08:50:12 GMT (envelope-from pho@FreeBSD.org)
Message-Id: <201609090850.u898oCjt088643@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: Fri, 9 Sep 2016 08:50:12 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r305654 - 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.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: Fri, 09 Sep 2016 08:50:13 -0000

Author: pho
Date: Fri Sep  9 08:50:11 2016
New Revision: 305654
URL: https://svnweb.freebsd.org/changeset/base/305654

Log:
  Updated test with findings. Don't loop forever if umount(1) fail.
  
  Sponsored by:	Dell EMC Isilon

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

Modified: user/pho/stress2/misc/suj18.sh
==============================================================================
--- user/pho/stress2/misc/suj18.sh	Fri Sep  9 08:48:09 2016	(r305653)
+++ user/pho/stress2/misc/suj18.sh	Fri Sep  9 08:50:11 2016	(r305654)
@@ -31,6 +31,10 @@
 # SUJ and quota test scenario.
 # "panic: check_inode_unwritten: busy inode" seen.
 
+# Deadlock seen:
+# https://people.freebsd.org/~pho/stress/log/suj18.txt
+# Fixed by r305594.
+
 [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1
 
 . ../default.cfg
@@ -53,8 +57,10 @@ export RUNDIR=${mntpoint}/stressX
 chmod 777 ${mntpoint}
 su ${testuser} -c 'sh -c "(cd ..;runRUNTIME=20m ./run.sh disk.cfg > /dev/null 2>&1)"'
 
-while mount | grep -q ${mntpoint}; do
-	umount ${mntpoint} || sleep 1
+rm -f $PATH_FSTAB
+for i in `jot 6`; do
+	umount $mntpoint && break || sleep 10
 done
+[ $i -eq 6 ] && exit 1
 mdconfig -d -u ${mdstart}
-rm -f $PATH_FSTAB
+exit 0