From owner-svn-src-user@freebsd.org  Tue May 16 09:08:25 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 41083D6D9F0
 for <svn-src-user@mailman.ysv.freebsd.org>;
 Tue, 16 May 2017 09:08:25 +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 08ABEF63;
 Tue, 16 May 2017 09:08:24 +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 v4G98OuP022758;
 Tue, 16 May 2017 09:08:24 GMT (envelope-from pho@FreeBSD.org)
Received: (from pho@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4G98OZf022757;
 Tue, 16 May 2017 09:08:24 GMT (envelope-from pho@FreeBSD.org)
Message-Id: <201705160908.v4G98OZf022757@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:08:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r318341 - 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:08:25 -0000

Author: pho
Date: Tue May 16 09:08:23 2017
New Revision: 318341
URL: https://svnweb.freebsd.org/changeset/base/318341

Log:
  Tune disk and journal size to make this test run.
  
  Sponsored by:	Dell EMC Isilon

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

Modified: user/pho/stress2/misc/gjournal2.sh
==============================================================================
--- user/pho/stress2/misc/gjournal2.sh	Tue May 16 09:06:07 2017	(r318340)
+++ user/pho/stress2/misc/gjournal2.sh	Tue May 16 09:08:23 2017	(r318341)
@@ -34,22 +34,27 @@
 
 . ../default.cfg
 
-size="2g"
+[ `swapinfo | wc -l` -eq 1 ] && exit 0
+size="5g"
+jsize="3g"
+[ $((`sysctl -n hw.usermem` / 1024 / 1024 / 1024)) -le ${size%g} ] && exit 0
+[ `swapinfo -k | tail -1 | awk '{print int($4/1024/1024)}'` -lt \
+    ${size%g} ] && exit 0
 mount | grep $mntpoint | grep -q /dev/md && umount -f $mntpoint
-mdconfig -l | grep -q md$mdstart &&  mdconfig -d -u $mdstart
+[ -c /dev/md$mdstart ] && mdconfig -d -u $mdstart
 mdconfig -a -t swap -s $size -u $mdstart || exit 1
 
 gjournal load
-gjournal label md$mdstart
+gjournal label -s $jsize md$mdstart
 sleep .5
 newfs -J /dev/md$mdstart.journal > /dev/null
 mount -o async /dev/md$mdstart.journal $mntpoint
 chmod 777 $mntpoint
 
-export runRUNTIME=30m
+export runRUNTIME=10m
 export RUNDIR=$mntpoint/stressX
 
-su $testuser -c 'cd ..; ./run.sh marcus.cfg'
+su $testuser -c 'cd ..; ./run.sh marcus.cfg' > /dev/null 2>&1
 
 gjournal sync
 while mount | grep $mntpoint | grep -q /dev/md; do