From owner-svn-src-user@FreeBSD.ORG Mon Jun 1 10:25:54 2015 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4E950C6; Mon, 1 Jun 2015 10:25:54 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 2490C1819; Mon, 1 Jun 2015 10:25:54 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t51APsPD087980; Mon, 1 Jun 2015 10:25:54 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t51APrSa087977; Mon, 1 Jun 2015 10:25:53 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201506011025.t51APrSa087977@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Mon, 1 Jun 2015 10:25:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r283876 - 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.20 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: Mon, 01 Jun 2015 10:25:54 -0000 Author: pho Date: Mon Jun 1 10:25:53 2015 New Revision: 283876 URL: https://svnweb.freebsd.org/changeset/base/283876 Log: Do not run these two tests on small memory configurations and on hosts without a swap disk. Sponsored by: EMC / Isilon storage division Modified: user/pho/stress2/misc/tcp.sh user/pho/stress2/misc/tcp2.sh Modified: user/pho/stress2/misc/tcp.sh ============================================================================== --- user/pho/stress2/misc/tcp.sh Mon Jun 1 09:04:57 2015 (r283875) +++ user/pho/stress2/misc/tcp.sh Mon Jun 1 10:25:53 2015 (r283876) @@ -33,6 +33,9 @@ [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 +[ `swapinfo | wc -l` -eq 1 ] && exit 0 +[ $((`sysctl -n hw.usermem` / 1024 / 1024 / 1024)) -le 3 ] && exit 0 + . ../default.cfg rm -rf /tmp/stressX.control @@ -41,7 +44,8 @@ chmod 777 $RUNDIR export runRUNTIME=15m export tcpLOAD=100 n=`su $testuser -c "limits | grep maxprocesses | awk '{print \\$NF}'"` -export tcpINCARNATIONS=$((n / 2 - 10)) +n=$((n - `ps aux | wc -l`)) +export tcpINCARNATIONS=$((n / 2 - 400)) export TESTPROGS=" ./testcases/tcp/tcp" su $testuser -c '(cd ..; ./testcases/run/run $TESTPROGS)' & Modified: user/pho/stress2/misc/tcp2.sh ============================================================================== --- user/pho/stress2/misc/tcp2.sh Mon Jun 1 09:04:57 2015 (r283875) +++ user/pho/stress2/misc/tcp2.sh Mon Jun 1 10:25:53 2015 (r283876) @@ -33,6 +33,9 @@ [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 +[ `swapinfo | wc -l` -eq 1 ] && exit 0 +[ $((`sysctl -n hw.usermem` / 1024 / 1024 / 1024)) -le 3 ] && exit 0 + . ../default.cfg rm -rf /tmp/stressX.control @@ -42,7 +45,8 @@ export runRUNTIME=15m export tcpLOAD=100 export swapLOAD=100 n=`su $testuser -c "limits | grep maxprocesses | awk '{print \\$NF}'"` -export tcpINCARNATIONS=$((n / 2 - 40)) +n=$((n - `ps aux | wc -l`)) +export tcpINCARNATIONS=$((n / 2 - 400)) export TESTPROGS=" ./testcases/tcp/tcp ./testcases/swap/swap