From owner-svn-src-user@freebsd.org  Mon Sep 18 08:44:51 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 7E33CE01652
 for <svn-src-user@mailman.ysv.freebsd.org>;
 Mon, 18 Sep 2017 08:44:51 +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 4C7F8216;
 Mon, 18 Sep 2017 08:44:51 +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 v8I8ioHU040767;
 Mon, 18 Sep 2017 08:44:50 GMT (envelope-from pho@FreeBSD.org)
Received: (from pho@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8I8io9R040766;
 Mon, 18 Sep 2017 08:44:50 GMT (envelope-from pho@FreeBSD.org)
Message-Id: <201709180844.v8I8io9R040766@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: Mon, 18 Sep 2017 08:44:50 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r323701 - 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: 323701
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: Mon, 18 Sep 2017 08:44:51 -0000

Author: pho
Date: Mon Sep 18 08:44:50 2017
New Revision: 323701
URL: https://svnweb.freebsd.org/changeset/base/323701

Log:
  Added timeout and return fsck status.
  
  Sponsored by:	Dell EMC Isilon

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

Modified: user/pho/stress2/misc/marcus2.sh
==============================================================================
--- user/pho/stress2/misc/marcus2.sh	Mon Sep 18 08:42:04 2017	(r323700)
+++ user/pho/stress2/misc/marcus2.sh	Mon Sep 18 08:44:50 2017	(r323701)
@@ -53,10 +53,22 @@ m=`su $testuser -c "limits | grep maxprocesses | awk '
 export INCARNATIONS=$((m / n))
 export swapINCARNATIONS=$INCARNATIONS
 
-su $testuser -c 'cd ..; ./run.sh marcus.cfg'
+su $testuser -c 'cd ..; ./run.sh marcus.cfg' &
 
+sleep 10
+start=`date '+%s'`
+while pgrep -q run; do
+	[ $((`date '+%s'` - start)) -gt 1500 ] &&
+	    ../tools/killall.sh
+	sleep 10
+done
+wait
+
+n=0
 while mount | grep $mntpoint | grep -q /dev/md; do
 	umount $mntpoint || sleep 1
+	[ $((n += 1)) -gt 300 ] && { echo FAIL; exit 1; }
 done
-checkfs /dev/md${mdstart}$part
+checkfs /dev/md${mdstart}$part; s=$?
 mdconfig -d -u $mdstart
+exit $s