From owner-svn-src-user@freebsd.org Tue Sep 26 12:46:19 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 2BEA7E09D40
for <svn-src-user@mailman.ysv.freebsd.org>;
Tue, 26 Sep 2017 12:46:19 +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 EE2516491F;
Tue, 26 Sep 2017 12:46:18 +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 v8QCkI1u043095;
Tue, 26 Sep 2017 12:46:18 GMT (envelope-from pho@FreeBSD.org)
Received: (from pho@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8QCkIrA043094;
Tue, 26 Sep 2017 12:46:18 GMT (envelope-from pho@FreeBSD.org)
Message-Id: <201709261246.v8QCkIrA043094@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, 26 Sep 2017 12:46:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r324015 - 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: 324015
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 " user"
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, 26 Sep 2017 12:46:19 -0000
Author: pho
Date: Tue Sep 26 12:46:17 2017
New Revision: 324015
URL: https://svnweb.freebsd.org/changeset/base/324015
Log:
Limit runtime. Return fsck(8) status.
Sponsored by: Dell EMC Isilon
Modified:
user/pho/stress2/misc/newfs3.sh
Modified: user/pho/stress2/misc/newfs3.sh
==============================================================================
--- user/pho/stress2/misc/newfs3.sh Tue Sep 26 12:15:13 2017 (r324014)
+++ user/pho/stress2/misc/newfs3.sh Tue Sep 26 12:46:17 2017 (r324015)
@@ -46,6 +46,7 @@ opt="-O2" # newfs option. Eg. -U
mount | grep "$mntpoint" | grep -q md${mdstart}$part && umount $mntpoint
[ -c /dev/md$mdstart ] && mdconfig -d -u $mdstart
+s=0
while [ $size -le $((128 * 1024 * 1024)) ]; do
mb=$((size / 1024 / 1024))
rm -f $diskimage
@@ -65,11 +66,15 @@ while [ $size -le $((128 * 1024 * 1024)) ]; do
export runRUNTIME=15s
export RUNTIME=$runRUNTIME
export CTRLDIR=$mntpoint/stressX.control
- (cd ..; ./run.sh disk.cfg) > /dev/null
+ (cd ..; ./run.sh disk.cfg) > /dev/null 2>&1 &
+ sleep 15
+ ../tools/killall.sh
+ wait
while mount | grep "$mntpoint" | \
grep -q md${mdstart}$part; do
umount $mntpoint > /dev/null 2>&1
done
+ checkfs /dev/md${mdstart}$part || s=1
done
blocksize=$((blocksize * 2))
done
@@ -77,3 +82,4 @@ while [ $size -le $((128 * 1024 * 1024)) ]; do
size=$((size + 32 * 1024 * 1024))
done
rm -f $diskimage
+return $s