From owner-svn-src-user@freebsd.org  Tue May 16 09:06:08 2017
Return-Path: <owner-svn-src-user@freebsd.org>
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 DEDA3D6D9D1
 for <svn-src-user@mailman.ysv.freebsd.org>;
 Tue, 16 May 2017 09:06:08 +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 8A211E36;
 Tue, 16 May 2017 09:06:08 +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 v4G967KS022641;
 Tue, 16 May 2017 09:06:07 GMT (envelope-from pho@FreeBSD.org)
Received: (from pho@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4G967Wh022640;
 Tue, 16 May 2017 09:06:07 GMT (envelope-from pho@FreeBSD.org)
Message-Id: <201705160906.v4G967Wh022640@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org
 using -f
From: Peter Holm <pho@FreeBSD.org>
Date: Tue, 16 May 2017 09:06:07 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r318340 - 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 &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 16 May 2017 09:06:09 -0000

Author: pho
Date: Tue May 16 09:06:07 2017
New Revision: 318340
URL: https://svnweb.freebsd.org/changeset/base/318340

Log:
  Make sure that there is enough swap to run this test and increase the
  journal size.
  
  Sponsored by:	Dell EMC Isilon

Modified:
  user/pho/stress2/misc/gjournal.sh

Modified: user/pho/stress2/misc/gjournal.sh
==============================================================================
--- user/pho/stress2/misc/gjournal.sh	Tue May 16 07:24:09 2017	(r318339)
+++ user/pho/stress2/misc/gjournal.sh	Tue May 16 09:06:07 2017	(r318340)
@@ -35,30 +35,37 @@
 . ../default.cfg
 
 size="2g"
+[ `swapinfo | wc -l` -eq 1 ] && exit 0
+[ `swapinfo -k | tail -1 | awk '{print int($4/1024/1024)}'` -lt \
+    ${size%g} ] && exit 0
 m=$((mdstart + 1))
-mount | grep /media    | grep -q /dev/md && umount -f /media
+mp2=${mntpoint}2
+mount | grep $mp2    | grep -q /dev/md && umount -f $mp2
 mount | grep $mntpoint | grep -q /dev/md && umount -f $mntpoint
-mdconfig -l | grep -q md$mdstart &&  mdconfig -d -u $mdstart
-mdconfig -l | grep -q md$m       &&  mdconfig -d -u $m
+[ -c /dev/md$mdstart ] && mdconfig -d -u $mdstart
+[ -c /dev/md$m ] && mdconfig -d -u $m
+mkdir -p $mp2
 mdconfig -a -t swap -s $size -u $mdstart || exit 1
 
 gjournal load
-gjournal label -s $((200 * 1024 * 1024)) md$mdstart
+gjournal label -s 512m md$mdstart
 sleep .5
 newfs -J /dev/md$mdstart.journal > /dev/null
 mount -o async /dev/md$mdstart.journal $mntpoint
 
 here=`pwd`
 cd $mntpoint
-truncate -s 1g image
+dd if=/dev/zero of=image bs=1m count=1k 2>&1 | \
+    egrep -v 'records|transferred'
 mdconfig -a -t vnode -f image -u $m
 bsdlabel -w md$m auto
 newfs md${m}$part > /dev/null
-mount /dev/md${m}$part /media
+mount /dev/md${m}$part $mp2
 # dd will suspend in wdrain
-dd if=/dev/zero of=/media/zero bs=1M 2>&1 | egrep -v "records|transferred"
-while mount | grep /media | grep -q /dev/md; do
-	umount /media || sleep 1
+echo "Expect \"$mp2: write failed, filesystem is full\""
+dd if=/dev/zero of=$mp2/zero bs=1M > /dev/null 2>&1
+while mount | grep $mp2 | grep -q /dev/md; do
+	umount $mp2 || sleep 1
 done
 mdconfig -d -u $m
 cd $here