From owner-svn-src-user@freebsd.org Thu May 4 06:45:45 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 138F5D5D8DA for ; Thu, 4 May 2017 06:45:45 +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 C0CB11A0F; Thu, 4 May 2017 06:45:44 +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 v446jhol009481; Thu, 4 May 2017 06:45:43 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v446jhtf009479; Thu, 4 May 2017 06:45:43 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201705040645.v446jhtf009479@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Thu, 4 May 2017 06:45:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r317788 - 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 " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 May 2017 06:45:45 -0000 Author: pho Date: Thu May 4 06:45:43 2017 New Revision: 317788 URL: https://svnweb.freebsd.org/changeset/base/317788 Log: Limit test runtime and added when problems was fixed. Sponsored by: Dell EMC Isilon Modified: user/pho/stress2/misc/oovm.sh user/pho/stress2/misc/oovm2.sh Modified: user/pho/stress2/misc/oovm.sh ============================================================================== --- user/pho/stress2/misc/oovm.sh Thu May 4 06:41:17 2017 (r317787) +++ user/pho/stress2/misc/oovm.sh Thu May 4 06:45:43 2017 (r317788) @@ -28,19 +28,23 @@ # $FreeBSD$ # -# Out of VM deadlock seen. +# Out of VM deadlock seen. Introduced by r285808. # https://people.freebsd.org/~pho/stress/log/oovm.txt # https://people.freebsd.org/~pho/stress/log/oovm-2.txt +# Fixed by r290047 and + # Test scenario suggestion by alc@ . ../default.cfg [ `swapinfo | wc -l` -eq 1 ] && exit 0 +maxsize=$((2 * 1024)) # Limit size due to runtime reasons size=$((`sysctl -n hw.physmem` / 1024 / 1024)) -need=$((size * 2)) [ $size -gt $((4 * 1024)) ] && - echo "RAM should be be capped to 4G for this test." + echo "RAM should be capped to 4GB for this test." +[ $size -gt $maxsize ] && size=$maxsize +need=$((size * 2)) d1=${diskimage}.1 d2=${diskimage}.2 rm -f $d1 $d2 @@ -49,7 +53,7 @@ rm -f $d1 $d2 dd if=/dev/zero of=$d1 bs=1m count=$size 2>&1 | \ egrep -v "records|transferred" cp $d1 $d2 || exit -trap "rm -f $d1 $d2" EXIT SIGINT +trap "rm -f $d1 $d2" EXIT INT dir=/tmp odir=`pwd` Modified: user/pho/stress2/misc/oovm2.sh ============================================================================== --- user/pho/stress2/misc/oovm2.sh Thu May 4 06:41:17 2017 (r317787) +++ user/pho/stress2/misc/oovm2.sh Thu May 4 06:45:43 2017 (r317788) @@ -31,12 +31,16 @@ # Out of VM deadlock seen. Introduced by r285808. Variation of oovm.sh # https://people.freebsd.org/~pho/stress/log/oovm2.txt +# Fixed by r290047 and + # Test scenario suggestion by alc@ . ../default.cfg [ `swapinfo | wc -l` -eq 1 ] && exit 0 +maxsize=$((2 * 1024)) # Limit size due to runtime reasons size=$((`sysctl -n hw.physmem` / 1024 / 1024)) +[ $size -gt $maxsize ] && size=$maxsize d1=${diskimage}.1 d2=${diskimage}.2 d3=${diskimage}.3