From owner-svn-src-user@freebsd.org Tue Sep 19 07:02:03 2017 Return-Path: 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 ACB6DE00316 for ; Tue, 19 Sep 2017 07:02:03 +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 7CFD16D7C9; Tue, 19 Sep 2017 07:02:03 +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 v8J722BC000715; Tue, 19 Sep 2017 07:02:02 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8J722jP000714; Tue, 19 Sep 2017 07:02:02 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201709190702.v8J722jP000714@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Tue, 19 Sep 2017 07:02:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r323731 - 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: 323731 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" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Sep 2017 07:02:03 -0000 Author: pho Date: Tue Sep 19 07:02:02 2017 New Revision: 323731 URL: https://svnweb.freebsd.org/changeset/base/323731 Log: Limit runtime for each FS type test. Return fsck(8) status. Sponsored by: Dell EMC Isilon Modified: user/pho/stress2/misc/fs.sh Modified: user/pho/stress2/misc/fs.sh ============================================================================== --- user/pho/stress2/misc/fs.sh Tue Sep 19 06:54:01 2017 (r323730) +++ user/pho/stress2/misc/fs.sh Tue Sep 19 07:02:02 2017 (r323731) @@ -33,6 +33,7 @@ [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 . ../default.cfg +flag=/tmp/fs.sh.flag ftest () { # option, disk full [ $2 -eq 1 ] && df=", disk full" || df="" @@ -42,7 +43,7 @@ ftest () { # option, disk full chmod 777 $mntpoint export RUNDIR=$mntpoint/stressX - export runRUNTIME=2m + export runRUNTIME=1m disk=$(($2 + 1)) # 1 or 2 set `df -ik $mntpoint | tail -1 | awk '{print $4,$7}'` export KBLOCKS=$(($1 * disk)) @@ -50,17 +51,22 @@ ftest () { # option, disk full for i in `jot 2`; do rm -rf /tmp/stressX.control $RUNDIR - su $testuser -c "(cd ..; ./run.sh disk.cfg)" > /dev/null 2>&1 + su $testuser -c "(cd ..; ./run.sh disk.cfg)" > \ + /dev/null 2>&1 & + sleep 60 + ../tools/killall.sh + wait done while mount | grep $mntpoint | grep -q /dev/md; do umount $mntpoint || sleep 1 done + checkfs /dev/md${mdstart}$part || touch $flag } -mount | grep "$mntpoint" | grep md${mdstart}$part > /dev/null && umount $mntpoint -mdconfig -l | grep md$mdstart > /dev/null && mdconfig -d -u $mdstart +mount | grep "on $mntpoint " | grep -q md${mdstart}$part && umount $mntpoint +[ -c /dev/md$mdstart ] && mdconfig -d -u $mdstart mdconfig -a -t swap -s 20m -u $mdstart bsdlabel -w md$mdstart auto @@ -75,3 +81,6 @@ ftest "-j" 0 # ufs2 + SU+J ftest "-j" 1 # ufs2 + SU+J, disk full mdconfig -d -u $mdstart +[ -f $flag ] && s=1 || s=0 +rm -f $flag +exit $s