From owner-svn-src-user@freebsd.org Mon Sep 18 08:42:05 2017 Return-Path: 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 C33B4E0140D for ; Mon, 18 Sep 2017 08:42:05 +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 8D903AE; Mon, 18 Sep 2017 08:42:05 +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 v8I8g4ER040589; Mon, 18 Sep 2017 08:42:04 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8I8g4ax040588; Mon, 18 Sep 2017 08:42:04 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201709180842.v8I8g4ax040588@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Mon, 18 Sep 2017 08:42:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r323700 - user/pho/stress2 X-SVN-Group: user X-SVN-Commit-Author: pho X-SVN-Commit-Paths: user/pho/stress2 X-SVN-Commit-Revision: 323700 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.23 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, 18 Sep 2017 08:42:05 -0000 Author: pho Date: Mon Sep 18 08:42:04 2017 New Revision: 323700 URL: https://svnweb.freebsd.org/changeset/base/323700 Log: Move start mdconfig unit number to avoid possible collisions. Trust fsck to report if file system was modified. Sponsored by: Dell EMC Isilon Modified: user/pho/stress2/default.cfg Modified: user/pho/stress2/default.cfg ============================================================================== --- user/pho/stress2/default.cfg Mon Sep 18 08:38:38 2017 (r323699) +++ user/pho/stress2/default.cfg Mon Sep 18 08:42:04 2017 (r323700) @@ -59,7 +59,7 @@ testcases/tcp/tcp export diskimage=${diskimage:-/tmp/diskimage} # Location of 1G disk image export mntpoint=${mntpoint:-/mnt} # Disk image mount point export testuser=${testuser:-TBD} # Name of non root test user -export mdstart=${mdstart:-5} # Start of free md units +export mdstart=${mdstart:-10} # Start of free md units export part=${part:-a} # Partition to use on a md FS export newfs_flags=${newfs_flags:-"-U"} # Default file system flags export stress2origin=${stress2origin:-`pwd`} @@ -75,20 +75,20 @@ dede () { # file, blocksize, count return $status } -# fsck and dumpfs comparison +# fsck wrapper checkfs () { - dumpfs $1 | sed '/UFS2/s/..:..:../xx:xx:xx/' > /tmp/dumpfs.1 - sleep 1 - fsck -t ufs -y $1 > /tmp/fsck.log 2>&1 - dumpfs $1 | sed '/UFS2/s/..:..:../xx:xx:xx/' > /tmp/dumpfs.2 - if egrep -q "INCONSISTENCY|MODIFIED" /tmp/fsck.log || - ! cmp -s /tmp/dumpfs.1 /tmp/dumpfs.2; then - diff -c /tmp/dumpfs.1 /tmp/dumpfs.2 - echo "fsck -t ufs -y $1" - cat /tmp/fsck.log - else - rm -f /tmp/fsck.log /tmp/dumpfs.[12] - fi + local s + + fsck -t ufs -fy $1 > /tmp/fsck.log 2>&1 + if egrep -q "BAD|INCONSISTENCY|MODIFIED" /tmp/fsck.log; then + echo "fsck -t ufs -fy $1" + cat /tmp/fsck.log + s=1 + else + rm -f /tmp/fsck.log /tmp/dumpfs.[12] + s=0 + fi + return $s } # Support for pre-build binaries for stress2/misc tests