From owner-svn-src-user@freebsd.org Tue Apr 24 10:11:02 2018 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2751CFC23B8 for ; Tue, 24 Apr 2018 10:11:02 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id CD5CB797F0; Tue, 24 Apr 2018 10:11:01 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C3B5811B4F; Tue, 24 Apr 2018 10:11:01 +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 w3OAB1wL017212; Tue, 24 Apr 2018 10:11:01 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w3OAB1qu017211; Tue, 24 Apr 2018 10:11:01 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201804241011.w3OAB1qu017211@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Tue, 24 Apr 2018 10:11:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r332927 - 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: 332927 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.25 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, 24 Apr 2018 10:11:02 -0000 Author: pho Date: Tue Apr 24 10:11:01 2018 New Revision: 332927 URL: https://svnweb.freebsd.org/changeset/base/332927 Log: Style fix. Sponsored by: Dell EMC Isilon Modified: user/pho/stress2/misc/crossmp2.sh Modified: user/pho/stress2/misc/crossmp2.sh ============================================================================== --- user/pho/stress2/misc/crossmp2.sh Tue Apr 24 10:09:24 2018 (r332926) +++ user/pho/stress2/misc/crossmp2.sh Tue Apr 24 10:11:01 2018 (r332927) @@ -40,14 +40,15 @@ if [ $# -eq 0 ]; then [ -z "$nfs_export" ] && exit 0 ping -c 2 `echo $nfs_export | sed 's/:.*//'` > /dev/null 2>&1 || exit 0 - mount -t nfs -o tcp -o nfsv3 -o retrycnt=1 -o intr -o soft,timeout=1 \ + mount -t nfs -o tcp -o nfsv3 -o retrycnt=1 -o intr,soft,timeout=1 \ -o rw $nfs_export $mntpoint || exit 0 + sleep .2 umount $mntpoint for i in `jot $mounts`; do mp=${mntpoint}$i [ ! -d $mp ] && mkdir $mp - mount | grep -qw "$mp" && umount $mp + mount | grep -q "$mp " && umount $mp done # start the parallel tests @@ -56,6 +57,7 @@ if [ $# -eq 0 ]; then ./$0 find & done wait + exit 0 else if [ $1 = find ]; then for i in `jot 128`; do @@ -67,16 +69,15 @@ else # The test: Parallel mount and unmounts for i in `jot 128`; do m=$1 - mount -t nfs -o tcp -o nfsv3 -o retrycnt=3 -o intr \ - -o soft -o rw $nfs_export ${mntpoint}$m + mount -t nfs -o tcp -o nfsv3 -o retrycnt=3 \ + -o intr,soft -o rw $nfs_export ${mntpoint}$m sleep .5 opt=`[ $(( m % 2 )) -eq 0 ] && echo -f` n=0 - while mount | grep -qw ${mntpoint}$m; do + while mount | grep -q "${mntpoint}$m "; do umount $opt ${mntpoint}$m > /dev/null 2>&1 - n=$((n + 1)) - [ $n -gt 99 ] && umount -f ${mntpoint}$m > \ - /dev/null 2>&1 + [ $((n += 1)) -gt 99 ] && umount -f \ + ${mntpoint}$m > /dev/null 2>&1 [ $n -gt 100 ] && exit done done