From owner-svn-src-user@freebsd.org Mon Aug 31 12:42:23 2015 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 BA7949C6D80 for ; Mon, 31 Aug 2015 12:42:23 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org (repo.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 A87BDE1E; Mon, 31 Aug 2015 12:42:23 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t7VCgNoT079038; Mon, 31 Aug 2015 12:42:23 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7VCgM1b079032; Mon, 31 Aug 2015 12:42:22 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201508311242.t7VCgM1b079032@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Mon, 31 Aug 2015 12:42:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r287325 - 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, 31 Aug 2015 12:42:23 -0000 Author: pho Date: Mon Aug 31 12:42:21 2015 New Revision: 287325 URL: https://svnweb.freebsd.org/changeset/base/287325 Log: Added Ctrl-C trap handling. Sponsored by: EMC / Isilon storage division Modified: user/pho/stress2/misc/altbufferflushes.sh user/pho/stress2/misc/lockf.sh user/pho/stress2/misc/lookup_shared.sh user/pho/stress2/misc/overcommit2.sh user/pho/stress2/misc/signal.sh Modified: user/pho/stress2/misc/altbufferflushes.sh ============================================================================== --- user/pho/stress2/misc/altbufferflushes.sh Mon Aug 31 12:28:13 2015 (r287324) +++ user/pho/stress2/misc/altbufferflushes.sh Mon Aug 31 12:42:21 2015 (r287325) @@ -80,7 +80,7 @@ diskfree=`df -k /var/tmp | tail -1 | awk [ $((diskfree / 1024 / 1024)) -lt 5 ] && echo "Not enough disk space" && exit 1 rm -f /var/.snap/stress2 /var/tmp/big.? -trap "rm -f /var/.snap/stress2 /var/tmp/big.?" 0 +trap "rm -f /var/.snap/stress2 /var/tmp/big.?" EXIT SIGINT persist 'mksnap_ffs /var /var/.snap/stress2' tresh=`sysctl vfs.dirtybufthresh | awk '{print $NF}'` sysctl vfs.dirtybufthresh=10 Modified: user/pho/stress2/misc/lockf.sh ============================================================================== --- user/pho/stress2/misc/lockf.sh Mon Aug 31 12:28:13 2015 (r287324) +++ user/pho/stress2/misc/lockf.sh Mon Aug 31 12:42:21 2015 (r287325) @@ -41,7 +41,7 @@ ping -c 2 `echo $nfs_export | sed 's/:.* pgrep -q lockd || { echo "lockd not running"; exit 0; } -trap "rm -f /tmp/$0.$$.*" 0 +trap "rm -f /tmp/$0.$$.*" EXIT SIGINT mount | grep "$mntpoint" | grep nfs > /dev/null && umount $mntpoint for i in `jot 100`; do Modified: user/pho/stress2/misc/lookup_shared.sh ============================================================================== --- user/pho/stress2/misc/lookup_shared.sh Mon Aug 31 12:28:13 2015 (r287324) +++ user/pho/stress2/misc/lookup_shared.sh Mon Aug 31 12:42:21 2015 (r287325) @@ -31,11 +31,10 @@ [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 saved=`sysctl vfs.lookup_shared | awk '{print $NF}'` +trap "sysctl vfs.lookup_shared=$saved" EXIT SIGINT export runRUNTIME=10m # Run tests for 10 minutes for i in 1 0; do sysctl vfs.lookup_shared=$i (cd ..; ./run.sh disk.cfg) done - -sysctl vfs.lookup_shared=$saved Modified: user/pho/stress2/misc/overcommit2.sh ============================================================================== --- user/pho/stress2/misc/overcommit2.sh Mon Aug 31 12:28:13 2015 (r287324) +++ user/pho/stress2/misc/overcommit2.sh Mon Aug 31 12:42:21 2015 (r287325) @@ -43,6 +43,7 @@ old=`sysctl -n vm.overcommit` size=$((`sysctl -n hw.usermem` / 1024 / 1024)) # in MB size=$((size + size / 100 * 20)) # 120% of hw.usermem sysctl vm.overcommit=1 +trap "sysctl vm.overcommit=$old" EXIT SIGINT mount | grep $mntpoint | grep -q /dev/md && umount -f $mntpoint mdconfig -l | grep -q md$mdstart && mdconfig -d -u $mdstart @@ -52,8 +53,8 @@ newfs $newfs_flags md${mdstart}$part > / mount /dev/md${mdstart}$part $mntpoint echo "Expect: -/mnt: write failed, filesystem is full -dd: /mnt/big.1: No space left on device" + /mnt: write failed, filesystem is full + dd: /mnt/big.1: No space left on device" for i in `jot 10`; do dd if=/dev/zero of=/mnt/big.$i bs=1m 2>&1 | \ @@ -65,5 +66,3 @@ while mount | grep "on $mntpoint " | gre umount $mntpoint || sleep 1 done mdconfig -d -u $mdstart - -sysctl vm.overcommit=$old Modified: user/pho/stress2/misc/signal.sh ============================================================================== --- user/pho/stress2/misc/signal.sh Mon Aug 31 12:28:13 2015 (r287324) +++ user/pho/stress2/misc/signal.sh Mon Aug 31 12:42:21 2015 (r287325) @@ -202,7 +202,7 @@ rm -f waitthread.c tkill.c rm -f gdbfifo gdbout pstat /tmp/waitthread ps | grep -v grep | grep waitthread | awk '{print $1}' | xargs kill mkfifo gdbfifo -trap "rm -f gdbfifo" 0 +trap "rm -f gdbfifo" EXIT SIGINT sleep 300 > gdbfifo & # Keep the fifo open fifopid=$!