From owner-svn-src-user@freebsd.org Sun Mar 8 06:06:21 2020 Return-Path: Delivered-To: svn-src-user@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 7E61625FAB5 for ; Sun, 8 Mar 2020 06:06:21 +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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48ZrT91H2Zz4V86; Sun, 8 Mar 2020 06:06:21 +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 273E21D6DF; Sun, 8 Mar 2020 06:06:21 +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 02866L6F060086; Sun, 8 Mar 2020 06:06:21 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02866LI8060085; Sun, 8 Mar 2020 06:06:21 GMT (envelope-from pho@FreeBSD.org) Message-Id: <202003080606.02866LI8060085@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Sun, 8 Mar 2020 06:06:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r358735 - 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: 358735 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.29 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: Sun, 08 Mar 2020 06:06:21 -0000 Author: pho Date: Sun Mar 8 06:06:20 2020 New Revision: 358735 URL: https://svnweb.freebsd.org/changeset/base/358735 Log: This tests would sometimes run for more than an hour. Fix that. Modified: user/pho/stress2/misc/zfs4.sh Modified: user/pho/stress2/misc/zfs4.sh ============================================================================== --- user/pho/stress2/misc/zfs4.sh Sun Mar 8 00:23:36 2020 (r358734) +++ user/pho/stress2/misc/zfs4.sh Sun Mar 8 06:06:20 2020 (r358735) @@ -62,6 +62,7 @@ zfs set snapdir=visible stress2_tank/test export RUNDIR=/stress2_tank/test/stressX export runRUNTIME=10m +start=`date +%s` (cd ..; ./run.sh marcus.cfg) & for i in `jot 20`; do @@ -70,9 +71,17 @@ done for i in `jot 20`; do zfs destroy stress2_tank/test@snap$i done +while pgrep -fq run.sh; do + [ $((`date +%s` - start)) -gt 660 ] && + ../tools/killall.sh + sleep 10 +done wait -zfs destroy -r stress2_tank +for i in `jot 3`; do + zfs destroy -r stress2_tank && break + sleep 10 +done zpool destroy stress2_tank mdconfig -d -u $u1