From owner-svn-src-user@FreeBSD.ORG Mon Aug 4 12:23:35 2014 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 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 49EBEE0A for ; Mon, 4 Aug 2014 12:23:35 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 26BBE24F6 for ; Mon, 4 Aug 2014 12:23:35 +0000 (UTC) Received: from pho (uid 788) (envelope-from pho@FreeBSD.org) id 5d2f by svn.freebsd.org (DragonFly Mail Agent v0.9+); Mon, 04 Aug 2014 12:23:35 +0000 From: Peter Holm Date: Mon, 4 Aug 2014 12:23:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r269516 - user/pho/stress2/misc X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <53df7b47.5d2f.b1289d0@svn.freebsd.org> X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.18 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, 04 Aug 2014 12:23:35 -0000 Author: pho Date: Mon Aug 4 12:23:34 2014 New Revision: 269516 URL: http://svnweb.freebsd.org/changeset/base/269516 Log: Added a new cross mount point test scenario. Sponsored by: EMC / Isilon storage division Added: user/pho/stress2/misc/crossmp3.sh (contents, props changed) Added: user/pho/stress2/misc/crossmp3.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/pho/stress2/misc/crossmp3.sh Mon Aug 4 12:23:34 2014 (r269516) @@ -0,0 +1,99 @@ +#!/bin/sh + +# +# Copyright (c) 2014 EMC Corp. +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. +# +# $FreeBSD$ +# + +# Parallel mount and umount of file systems +# No problems seen. + +[ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 + +. ../default.cfg + +N=`sysctl -n hw.ncpu` +size=$((`sysctl -n hw.usermem` / 1024 / 1024 / N)) + +mounts=$N # Number of parallel scripts +mdstart=$mdstart # Use md unit numbers from this point + +if [ $# -eq 0 ]; then + for i in `jot $mounts`; do + m=$(( i + mdstart - 1 )) + [ ! -d ${mntpoint}$m ] && mkdir ${mntpoint}$m + mount | grep "$mntpoint" | grep -q md$m && umount ${mntpoint}$m + mdconfig -l | grep -q md$m && mdconfig -d -u $m + + mdconfig -a -t swap -s ${size}m -u $m + bsdlabel -w md$m auto + newfs $newfs_flags md${m}$part > /dev/null 2>&1 + done + + # start the parallel tests + for i in `jot $mounts`; do + m=$(( i + mdstart - 1 )) + ./$0 $m & + ./$0 find & + done + + for i in `jot $mounts`; do + wait; wait + done + + for i in `jot $mounts`; do + m=$(( i + mdstart - 1 )) + mdconfig -d -u $m + rm -f $D$m + done + +else + touch /tmp/crossmp.continue + if [ $1 = find ]; then + while [ -f /tmp/crossmp.continue ]; do + find ${mntpoint}* -type f > /dev/null 2>&1 + done + else + export runRUNTIME=20s + # The test: Parallel mount and unmounts + for i in `jot 3`; do + m=$1 + mount /dev/md${m}${part} ${mntpoint}$m + chmod 777 ${mntpoint}$m + export RUNDIR=${mntpoint}$m/stressX + export CTRLDIR=${mntpoint}$m/stressX.control + (cd ${mntpoint}$m; find . -delete) + su $testuser -c 'cd ..; ./run.sh disk.cfg' > \ + /dev/null 2>&1 + + while mount | grep -q "on ${mntpoint}$m "; do + opt=$([ $((`date '+%s'` % 2)) -eq 0 ] && echo "-f") + umount $opt ${mntpoint}$m > /dev/null 2>&1 + done + done + rm -f /tmp/crossmp.continue + fi +fi