From owner-svn-src-user@freebsd.org Mon Sep 18 08:38:39 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 ACFACE012B8
for <svn-src-user@mailman.ysv.freebsd.org>;
Mon, 18 Sep 2017 08:38:39 +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 7B31A84D52;
Mon, 18 Sep 2017 08:38:39 +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 v8I8ccFv036612;
Mon, 18 Sep 2017 08:38:38 GMT (envelope-from pho@FreeBSD.org)
Received: (from pho@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8I8cchA036611;
Mon, 18 Sep 2017 08:38:38 GMT (envelope-from pho@FreeBSD.org)
Message-Id: <201709180838.v8I8cchA036611@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: Mon, 18 Sep 2017 08:38:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r323699 - 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: 323699
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" <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: Mon, 18 Sep 2017 08:38:39 -0000
Author: pho
Date: Mon Sep 18 08:38:38 2017
New Revision: 323699
URL: https://svnweb.freebsd.org/changeset/base/323699
Log:
Added timeout to test. Return fsck status.
Sponsored by: Dell EMC Isilon
Modified:
user/pho/stress2/misc/marcus.sh
Modified: user/pho/stress2/misc/marcus.sh
==============================================================================
--- user/pho/stress2/misc/marcus.sh Mon Sep 18 05:59:47 2017 (r323698)
+++ user/pho/stress2/misc/marcus.sh Mon Sep 18 08:38:38 2017 (r323699)
@@ -47,8 +47,11 @@ export RUNDIR=$mntpoint/stressX
su $testuser -c 'cd ..; ./run.sh marcus.cfg'
+n=0
while mount | grep $mntpoint | grep -q /dev/md; do
umount $mntpoint || sleep 1
+ [ $((n += 1)) -gt 300 ] && { echo FAIL; exit 1; }
done
-checkfs /dev/md${mdstart}$part
+checkfs /dev/md${mdstart}$part; s=$?
mdconfig -d -u $mdstart
+exit $s
From owner-svn-src-user@freebsd.org Mon Sep 18 08:42:05 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 C33B4E0140D
for <svn-src-user@mailman.ysv.freebsd.org>;
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 <pho@FreeBSD.org>
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" <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: 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
From owner-svn-src-user@freebsd.org Mon Sep 18 08:44:51 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 7E33CE01652
for <svn-src-user@mailman.ysv.freebsd.org>;
Mon, 18 Sep 2017 08:44:51 +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 4C7F8216;
Mon, 18 Sep 2017 08:44:51 +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 v8I8ioHU040767;
Mon, 18 Sep 2017 08:44:50 GMT (envelope-from pho@FreeBSD.org)
Received: (from pho@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8I8io9R040766;
Mon, 18 Sep 2017 08:44:50 GMT (envelope-from pho@FreeBSD.org)
Message-Id: <201709180844.v8I8io9R040766@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: Mon, 18 Sep 2017 08:44:50 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r323701 - 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: 323701
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" <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: Mon, 18 Sep 2017 08:44:51 -0000
Author: pho
Date: Mon Sep 18 08:44:50 2017
New Revision: 323701
URL: https://svnweb.freebsd.org/changeset/base/323701
Log:
Added timeout and return fsck status.
Sponsored by: Dell EMC Isilon
Modified:
user/pho/stress2/misc/marcus2.sh
Modified: user/pho/stress2/misc/marcus2.sh
==============================================================================
--- user/pho/stress2/misc/marcus2.sh Mon Sep 18 08:42:04 2017 (r323700)
+++ user/pho/stress2/misc/marcus2.sh Mon Sep 18 08:44:50 2017 (r323701)
@@ -53,10 +53,22 @@ m=`su $testuser -c "limits | grep maxprocesses | awk '
export INCARNATIONS=$((m / n))
export swapINCARNATIONS=$INCARNATIONS
-su $testuser -c 'cd ..; ./run.sh marcus.cfg'
+su $testuser -c 'cd ..; ./run.sh marcus.cfg' &
+sleep 10
+start=`date '+%s'`
+while pgrep -q run; do
+ [ $((`date '+%s'` - start)) -gt 1500 ] &&
+ ../tools/killall.sh
+ sleep 10
+done
+wait
+
+n=0
while mount | grep $mntpoint | grep -q /dev/md; do
umount $mntpoint || sleep 1
+ [ $((n += 1)) -gt 300 ] && { echo FAIL; exit 1; }
done
-checkfs /dev/md${mdstart}$part
+checkfs /dev/md${mdstart}$part; s=$?
mdconfig -d -u $mdstart
+exit $s
From owner-svn-src-user@freebsd.org Mon Sep 18 08:46: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 C6FFCE016D1
for <svn-src-user@mailman.ysv.freebsd.org>;
Mon, 18 Sep 2017 08:46: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 97213350;
Mon, 18 Sep 2017 08:46: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 v8I8k74g040876;
Mon, 18 Sep 2017 08:46:07 GMT (envelope-from pho@FreeBSD.org)
Received: (from pho@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8I8k7DV040875;
Mon, 18 Sep 2017 08:46:07 GMT (envelope-from pho@FreeBSD.org)
Message-Id: <201709180846.v8I8k7DV040875@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: Mon, 18 Sep 2017 08:46:07 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r323702 - 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: 323702
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" <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: Mon, 18 Sep 2017 08:46:08 -0000
Author: pho
Date: Mon Sep 18 08:46:07 2017
New Revision: 323702
URL: https://svnweb.freebsd.org/changeset/base/323702
Log:
Timeout on umount. Return fsck status.
Sponsored by: Dell EMC Isilon
Modified:
user/pho/stress2/misc/marcus5.sh
Modified: user/pho/stress2/misc/marcus5.sh
==============================================================================
--- user/pho/stress2/misc/marcus5.sh Mon Sep 18 08:44:50 2017 (r323701)
+++ user/pho/stress2/misc/marcus5.sh Mon Sep 18 08:46:07 2017 (r323702)
@@ -77,8 +77,11 @@ testcases/mkfifo/mkfifo
su $testuser -c 'cd ..; ./testcases/run/run $TESTPROGS'
+n=0
while mount | grep $mntpoint | grep -q /dev/md; do
umount $mntpoint || sleep 1
+ [ $((n += 1)) -gt 300 ] && { echo FAIL; exit 1; }
done
-checkfs /dev/md${mdstart}$part
+checkfs /dev/md${mdstart}$part; s=$!
mdconfig -d -u $mdstart
+exit $s
From owner-svn-src-user@freebsd.org Tue Sep 19 05:47:26 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 58067E24589
for <svn-src-user@mailman.ysv.freebsd.org>;
Tue, 19 Sep 2017 05:47:26 +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 231DE6B5DE;
Tue, 19 Sep 2017 05:47:26 +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 v8J5lPe7068507;
Tue, 19 Sep 2017 05:47:25 GMT (envelope-from pho@FreeBSD.org)
Received: (from pho@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8J5lPnS068506;
Tue, 19 Sep 2017 05:47:25 GMT (envelope-from pho@FreeBSD.org)
Message-Id: <201709190547.v8J5lPnS068506@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, 19 Sep 2017 05:47:25 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r323725 - 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: 323725
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" <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, 19 Sep 2017 05:47:26 -0000
Author: pho
Date: Tue Sep 19 05:47:24 2017
New Revision: 323725
URL: https://svnweb.freebsd.org/changeset/base/323725
Log:
Core dumps from truss(1) seen. Check for this.
Sponsored by: Dell EMC Isilon
Modified:
user/pho/stress2/misc/truss.sh
Modified: user/pho/stress2/misc/truss.sh
==============================================================================
--- user/pho/stress2/misc/truss.sh Mon Sep 18 23:50:34 2017 (r323724)
+++ user/pho/stress2/misc/truss.sh Tue Sep 19 05:47:24 2017 (r323725)
@@ -79,6 +79,7 @@ if pgrep -q ttruss; then
s=1
fi
+[ -f /tmp/truss.core ] && { ls -l /tmp/truss.core; s=1; }
rm -rf /tmp/ttruss /tmp/ttruss.core
exit $s
From owner-svn-src-user@freebsd.org Tue Sep 19 05:48:54 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 65591E245ED
for <svn-src-user@mailman.ysv.freebsd.org>;
Tue, 19 Sep 2017 05:48:54 +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 356176B6C7;
Tue, 19 Sep 2017 05:48:54 +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 v8J5mrn5068595;
Tue, 19 Sep 2017 05:48:53 GMT (envelope-from pho@FreeBSD.org)
Received: (from pho@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8J5mrA9068594;
Tue, 19 Sep 2017 05:48:53 GMT (envelope-from pho@FreeBSD.org)
Message-Id: <201709190548.v8J5mrA9068594@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, 19 Sep 2017 05:48:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r323726 - 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: 323726
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" <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, 19 Sep 2017 05:48:54 -0000
Author: pho
Date: Tue Sep 19 05:48:53 2017
New Revision: 323726
URL: https://svnweb.freebsd.org/changeset/base/323726
Log:
Handle a leading space in the inode number.
Sponsored by: Dell EMC Isilon
Modified:
user/pho/stress2/misc/truncate6.sh
Modified: user/pho/stress2/misc/truncate6.sh
==============================================================================
--- user/pho/stress2/misc/truncate6.sh Tue Sep 19 05:47:24 2017 (r323725)
+++ user/pho/stress2/misc/truncate6.sh Tue Sep 19 05:48:53 2017 (r323726)
@@ -57,7 +57,7 @@ rm -f truncate6.c
cd $mntpoint
/tmp/truncate6
-inode=`ls -ail | grep temp | sed 's/ .*//'`
+inode=`ls -ail | grep temp | awk '{print $1}'`
cd $here
rm -f /tmp/truncate6
@@ -84,6 +84,7 @@ else
fi
mdconfig -d -u $mdstart
+rm /tmp/truncate6
exit $e
EOF
#include <sys/types.h>
From owner-svn-src-user@freebsd.org Tue Sep 19 06:54:02 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 5B25AE26DBA
for <svn-src-user@mailman.ysv.freebsd.org>;
Tue, 19 Sep 2017 06:54:02 +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 28A7B6D3FA;
Tue, 19 Sep 2017 06:54:02 +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 v8J6s1ED096740;
Tue, 19 Sep 2017 06:54:01 GMT (envelope-from pho@FreeBSD.org)
Received: (from pho@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8J6s1cK096739;
Tue, 19 Sep 2017 06:54:01 GMT (envelope-from pho@FreeBSD.org)
Message-Id: <201709190654.v8J6s1cK096739@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, 19 Sep 2017 06:54:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r323730 - 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: 323730
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" <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, 19 Sep 2017 06:54:02 -0000
Author: pho
Date: Tue Sep 19 06:54:01 2017
New Revision: 323730
URL: https://svnweb.freebsd.org/changeset/base/323730
Log:
Improve error handling and return fsck(8) errors.
Sponsored by: Dell EMC Isilon
Modified:
user/pho/stress2/misc/gnop.sh
Modified: user/pho/stress2/misc/gnop.sh
==============================================================================
--- user/pho/stress2/misc/gnop.sh Tue Sep 19 06:46:00 2017 (r323729)
+++ user/pho/stress2/misc/gnop.sh Tue Sep 19 06:54:01 2017 (r323730)
@@ -34,17 +34,20 @@
# Out of VM seen:
# https://people.freebsd.org/~pho/stress/log/gnop.txt
+flag=/tmp/gnop.sh.flag
test() {
. ../default.cfg
+ set -e
mount | grep $mntpoint | grep -q /dev/md && umount -f $mntpoint
[ -c /dev/md$mdstart ] && mdconfig -d -u $mdstart
- mdconfig -a -t swap -s 2g -u $mdstart || exit 1
+ mdconfig -a -t swap -s 2g -u $mdstart
gnop create -S $1 /dev/md$mdstart
newfs $newfs_flags /dev/md$mdstart.nop > /dev/null
mount /dev/md$mdstart.nop $mntpoint
chmod 777 $mntpoint
+ set +e
export runRUNTIME=4m
export RUNDIR=$mntpoint/stressX
@@ -54,7 +57,7 @@ test() {
while mount | grep $mntpoint | grep -q /dev/md; do
umount $mntpoint || sleep 1
done
- checkfs /dev/md$mdstart.nop
+ checkfs /dev/md$mdstart.nop || touch $flag
gnop destroy /dev/md$mdstart.nop
mdconfig -d -u $mdstart
}
@@ -68,4 +71,6 @@ for i in 1k 2k 4k 8k; do
done
[ $notloaded ] && gnop unload
-exit 0
+[ -f $flag ] && s=1 || s=0
+rm -f $flag
+exit $s
From owner-svn-src-user@freebsd.org Tue Sep 19 07:02:03 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 ACB6DE00316
for <svn-src-user@mailman.ysv.freebsd.org>;
Tue, 19 Sep 2017 07:02:03 +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 7CFD16D7C9;
Tue, 19 Sep 2017 07:02:03 +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 v8J722BC000715;
Tue, 19 Sep 2017 07:02:02 GMT (envelope-from pho@FreeBSD.org)
Received: (from pho@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8J722jP000714;
Tue, 19 Sep 2017 07:02:02 GMT (envelope-from pho@FreeBSD.org)
Message-Id: <201709190702.v8J722jP000714@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, 19 Sep 2017 07:02:02 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r323731 - 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: 323731
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" <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, 19 Sep 2017 07:02:03 -0000
Author: pho
Date: Tue Sep 19 07:02:02 2017
New Revision: 323731
URL: https://svnweb.freebsd.org/changeset/base/323731
Log:
Limit runtime for each FS type test. Return fsck(8) status.
Sponsored by: Dell EMC Isilon
Modified:
user/pho/stress2/misc/fs.sh
Modified: user/pho/stress2/misc/fs.sh
==============================================================================
--- user/pho/stress2/misc/fs.sh Tue Sep 19 06:54:01 2017 (r323730)
+++ user/pho/stress2/misc/fs.sh Tue Sep 19 07:02:02 2017 (r323731)
@@ -33,6 +33,7 @@
[ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1
. ../default.cfg
+flag=/tmp/fs.sh.flag
ftest () { # option, disk full
[ $2 -eq 1 ] && df=", disk full" || df=""
@@ -42,7 +43,7 @@ ftest () { # option, disk full
chmod 777 $mntpoint
export RUNDIR=$mntpoint/stressX
- export runRUNTIME=2m
+ export runRUNTIME=1m
disk=$(($2 + 1)) # 1 or 2
set `df -ik $mntpoint | tail -1 | awk '{print $4,$7}'`
export KBLOCKS=$(($1 * disk))
@@ -50,17 +51,22 @@ ftest () { # option, disk full
for i in `jot 2`; do
rm -rf /tmp/stressX.control $RUNDIR
- su $testuser -c "(cd ..; ./run.sh disk.cfg)" > /dev/null 2>&1
+ su $testuser -c "(cd ..; ./run.sh disk.cfg)" > \
+ /dev/null 2>&1 &
+ sleep 60
+ ../tools/killall.sh
+ wait
done
while mount | grep $mntpoint | grep -q /dev/md; do
umount $mntpoint || sleep 1
done
+ checkfs /dev/md${mdstart}$part || touch $flag
}
-mount | grep "$mntpoint" | grep md${mdstart}$part > /dev/null && umount $mntpoint
-mdconfig -l | grep md$mdstart > /dev/null && mdconfig -d -u $mdstart
+mount | grep "on $mntpoint " | grep -q md${mdstart}$part && umount $mntpoint
+[ -c /dev/md$mdstart ] && mdconfig -d -u $mdstart
mdconfig -a -t swap -s 20m -u $mdstart
bsdlabel -w md$mdstart auto
@@ -75,3 +81,6 @@ ftest "-j" 0 # ufs2 + SU+J
ftest "-j" 1 # ufs2 + SU+J, disk full
mdconfig -d -u $mdstart
+[ -f $flag ] && s=1 || s=0
+rm -f $flag
+exit $s
From owner-svn-src-user@freebsd.org Tue Sep 19 15:50:19 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 F1E50E19F67
for <svn-src-user@mailman.ysv.freebsd.org>;
Tue, 19 Sep 2017 15:50:19 +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 B83199EC;
Tue, 19 Sep 2017 15:50:19 +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 v8JFoIRg019782;
Tue, 19 Sep 2017 15:50:18 GMT (envelope-from pho@FreeBSD.org)
Received: (from pho@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8JFoIYD019781;
Tue, 19 Sep 2017 15:50:18 GMT (envelope-from pho@FreeBSD.org)
Message-Id: <201709191550.v8JFoIYD019781@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, 19 Sep 2017 15:50:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r323766 - 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: 323766
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" <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, 19 Sep 2017 15:50:20 -0000
Author: pho
Date: Tue Sep 19 15:50:18 2017
New Revision: 323766
URL: https://svnweb.freebsd.org/changeset/base/323766
Log:
lidl@ suggested collapsing the 'grep' into the 'awk' invocation.
Removed a redundant 'rm' from the last commit.
Sponsored by: Dell EMC Isilon
Modified:
user/pho/stress2/misc/truncate6.sh
Modified: user/pho/stress2/misc/truncate6.sh
==============================================================================
--- user/pho/stress2/misc/truncate6.sh Tue Sep 19 15:39:47 2017 (r323765)
+++ user/pho/stress2/misc/truncate6.sh Tue Sep 19 15:50:18 2017 (r323766)
@@ -57,7 +57,7 @@ rm -f truncate6.c
cd $mntpoint
/tmp/truncate6
-inode=`ls -ail | grep temp | awk '{print $1}'`
+inode=$(ls -ail | awk '/temp/ {print $1}')
cd $here
rm -f /tmp/truncate6
@@ -84,7 +84,6 @@ else
fi
mdconfig -d -u $mdstart
-rm /tmp/truncate6
exit $e
EOF
#include <sys/types.h>
From owner-svn-src-user@freebsd.org Wed Sep 20 10:22:05 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 45EC7E07268
for <svn-src-user@mailman.ysv.freebsd.org>;
Wed, 20 Sep 2017 10:22: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 13D3965805;
Wed, 20 Sep 2017 10:22: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 v8KAM3lW081244;
Wed, 20 Sep 2017 10:22:03 GMT (envelope-from pho@FreeBSD.org)
Received: (from pho@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8KAM3Dh081243;
Wed, 20 Sep 2017 10:22:03 GMT (envelope-from pho@FreeBSD.org)
Message-Id: <201709201022.v8KAM3Dh081243@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: Wed, 20 Sep 2017 10:22:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r323806 - 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: 323806
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" <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: Wed, 20 Sep 2017 10:22:05 -0000
Author: pho
Date: Wed Sep 20 10:22:03 2017
New Revision: 323806
URL: https://svnweb.freebsd.org/changeset/base/323806
Log:
Return the fsck status.
Sponsored by: Dell EMC Isilon
Modified:
user/pho/stress2/misc/msdos.sh
Modified: user/pho/stress2/misc/msdos.sh
==============================================================================
--- user/pho/stress2/misc/msdos.sh Wed Sep 20 09:31:16 2017 (r323805)
+++ user/pho/stress2/misc/msdos.sh Wed Sep 20 10:22:03 2017 (r323806)
@@ -35,6 +35,7 @@
. ../default.cfg
[ -x /sbin/mount_msdosfs ] || exit
+log=/tmp/msdos.sh.log
mount | grep "$mntpoint" | grep -q md$mdstart && umount -f $mntpoint
mdconfig -l | grep -q $mdstart && mdconfig -d -u $mdstart
@@ -50,5 +51,12 @@ export runRUNTIME=10m # Run tests for 10 mi
while mount | grep "$mntpoint" | grep -q md$mdstart; do
umount $mntpoint || sleep 1
done
-fsck -t msdosfs -y /dev/md${mdstart}$part
+fsck -t msdosfs -y /dev/md${mdstart}$part > $log 2>&1
+s=0
+if egrep -q "BAD|INCONSISTENCY|MODIFIED" $log; then
+ cat $log
+ rm $log
+ s=1
+fi
mdconfig -d -u $mdstart
+exit $s
From owner-svn-src-user@freebsd.org Wed Sep 20 10:24:46 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 7B3B1E074B0
for <svn-src-user@mailman.ysv.freebsd.org>;
Wed, 20 Sep 2017 10:24:46 +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 495AE6595F;
Wed, 20 Sep 2017 10:24:46 +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 v8KAOjoI081374;
Wed, 20 Sep 2017 10:24:45 GMT (envelope-from pho@FreeBSD.org)
Received: (from pho@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8KAOj5h081373;
Wed, 20 Sep 2017 10:24:45 GMT (envelope-from pho@FreeBSD.org)
Message-Id: <201709201024.v8KAOj5h081373@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: Wed, 20 Sep 2017 10:24:45 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r323807 - 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: 323807
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" <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: Wed, 20 Sep 2017 10:24:46 -0000
Author: pho
Date: Wed Sep 20 10:24:45 2017
New Revision: 323807
URL: https://svnweb.freebsd.org/changeset/base/323807
Log:
Added problem found. Return fsck status and limit runtime.
Style fix.
Sponsored by: Dell EMC Isilon
Modified:
user/pho/stress2/misc/msdos4.sh
Modified: user/pho/stress2/misc/msdos4.sh
==============================================================================
--- user/pho/stress2/misc/msdos4.sh Wed Sep 20 10:22:03 2017 (r323806)
+++ user/pho/stress2/misc/msdos4.sh Wed Sep 20 10:24:45 2017 (r323807)
@@ -32,19 +32,23 @@
# "panic: leaf should be empty" seen
+# "panic: Assertion sq->sq_wchan != NULL" seen:
+# https://people.freebsd.org/~pho/stress/log/msdos4.txt
+
. ../default.cfg
[ -x /sbin/mount_msdosfs ] || exit
-mount | grep "$mntpoint" | grep -q md$mdstart && umount -f ${mntpoint}
-mdconfig -l | grep -q ${mdstart} && mdconfig -d -u $mdstart
+log=/tmp/msdos4.sh.log
+mount | grep "$mntpoint" | grep -q md$mdstart && umount -f $mntpoint
+mdconfig -l | grep -q $mdstart && mdconfig -d -u $mdstart
mdconfig -a -t swap -s 1g -u $mdstart
-bsdlabel -w md${mdstart} auto
+bsdlabel -w md$mdstart auto
newfs_msdos /dev/md${mdstart}$part > /dev/null
mount -t msdosfs /dev/md${mdstart}$part $mntpoint || exit 1
export RUNDIR=$mntpoint/stressX
-export runRUNTIME=20m
+export runRUNTIME=10m
export TESTPROGS='
testcases/lockf2/lockf2
testcases/openat/openat
@@ -62,5 +66,12 @@ testcases/swap/swap
while mount | grep "$mntpoint" | grep -q md$mdstart; do
umount $mntpoint || sleep 1
done
-fsck -t msdosfs -y /dev/md${mdstart}$part
+fsck -t msdosfs -y /dev/md${mdstart}$part > $log 2>&1
+s=0
+if egrep -q "BAD|INCONSISTENCY|MODIFIED" $log; then
+ cat $log
+ rm $log
+ s=1
+fi
mdconfig -d -u $mdstart
+exit $s
From owner-svn-src-user@freebsd.org Sat Sep 23 11:07:22 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 4F8B6E02627
for <svn-src-user@mailman.ysv.freebsd.org>;
Sat, 23 Sep 2017 11:07:22 +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 1D7FE6F9DC;
Sat, 23 Sep 2017 11:07:22 +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 v8NB7Lfb095743;
Sat, 23 Sep 2017 11:07:21 GMT (envelope-from pho@FreeBSD.org)
Received: (from pho@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8NB7L30095742;
Sat, 23 Sep 2017 11:07:21 GMT (envelope-from pho@FreeBSD.org)
Message-Id: <201709231107.v8NB7L30095742@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: Sat, 23 Sep 2017 11:07:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r323947 - 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: 323947
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" <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: Sat, 23 Sep 2017 11:07:22 -0000
Author: pho
Date: Sat Sep 23 11:07:21 2017
New Revision: 323947
URL: https://svnweb.freebsd.org/changeset/base/323947
Log:
Limit runtime and return fsck status.
Sponsored by: Dell EMC Isilon
Modified:
user/pho/stress2/misc/trim4.sh
Modified: user/pho/stress2/misc/trim4.sh
==============================================================================
--- user/pho/stress2/misc/trim4.sh Sat Sep 23 08:26:42 2017 (r323946)
+++ user/pho/stress2/misc/trim4.sh Sat Sep 23 11:07:21 2017 (r323947)
@@ -41,7 +41,8 @@ mdconfig -l | grep -q md$mdstart && mdconfig -d -u $m
size="1g"
[ $# -eq 0 ] && trim=-t
[ "$newfs_flags" = "-U" ] && flag="-j"
-for i in `jot 6`; do
+start=`date +%s`
+while [ $((`date +%s` - start)) -lt $((15 * 60)) ]; do
echo "Test #$i `date '+%T'`"
echo "mdconfig -a -t swap -s $size -u $mdstart"
mdconfig -a -t swap -s $size -u $mdstart || exit 1
@@ -61,6 +62,7 @@ for i in `jot 6`; do
while mount | grep $mntpoint | grep -q /dev/md; do
umount $mntpoint || sleep 1
done
- checkfs /dev/md${mdstart}$part
+ checkfs /dev/md${mdstart}$part; s=$?
mdconfig -d -u $mdstart
done
+exit $?
From owner-svn-src-user@freebsd.org Sat Sep 23 11:09:26 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 D1090E0264C
for <svn-src-user@mailman.ysv.freebsd.org>;
Sat, 23 Sep 2017 11:09:26 +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 AAD9F6FAC0;
Sat, 23 Sep 2017 11:09:26 +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 v8NB9PH2095846;
Sat, 23 Sep 2017 11:09:25 GMT (envelope-from pho@FreeBSD.org)
Received: (from pho@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8NB9P33095845;
Sat, 23 Sep 2017 11:09:25 GMT (envelope-from pho@FreeBSD.org)
Message-Id: <201709231109.v8NB9P33095845@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: Sat, 23 Sep 2017 11:09:25 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r323948 - 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: 323948
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" <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: Sat, 23 Sep 2017 11:09:26 -0000
Author: pho
Date: Sat Sep 23 11:09:25 2017
New Revision: 323948
URL: https://svnweb.freebsd.org/changeset/base/323948
Log:
Added new test that demonstrates a rename problem with msdosfs.
Sponsored by: Dell EMC Isilon
Added:
user/pho/stress2/misc/msdos8.sh (contents, props changed)
Added: user/pho/stress2/misc/msdos8.sh
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ user/pho/stress2/misc/msdos8.sh Sat Sep 23 11:09:25 2017 (r323948)
@@ -0,0 +1,158 @@
+#!/bin/sh
+
+#
+# Copyright (c) 2017 Dell EMC Isilon
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+# $FreeBSD$
+#
+
+# msdosfs rename scenario
+# "Invalid long filename entry" seen from fsck
+
+. ../default.cfg
+[ `id -u` -ne 0 ] && echo "Must be root!" && exit 1
+
+[ -x /sbin/mount_msdosfs ] || exit 0
+dir=/tmp
+odir=`pwd`
+cd $dir
+sed '1,/^EOF/d' < $odir/$0 > $dir/msdos8.c
+cc -o msdos8 -Wall -Wextra -O0 -g msdos8.c || exit 1
+rm -f msdos8.c
+cd $odir
+log=/tmp/msdos8.sh.log
+mount | grep "$mntpoint" | grep -q md$mdstart && umount -f $mntpoint
+mdconfig -l | grep -q $mdstart && mdconfig -d -u $mdstart
+
+mdconfig -a -t swap -s 1g -u $mdstart
+bsdlabel -w md$mdstart auto
+newfs_msdos /dev/md${mdstart}$part #> /dev/null
+mount -t msdosfs /dev/md${mdstart}$part $mntpoint || exit 1
+
+(cd $mntpoint; /tmp/msdos8)
+s=$?
+
+while mount | grep "$mntpoint" | grep -q md$mdstart; do
+ umount $mntpoint || sleep 1
+done
+fsck -t msdosfs -y /dev/md${mdstart}$part > $log 2>&1
+if egrep -q "BAD|INCONSISTENCY|MODIFIED" $log; then
+ cat $log
+ s=1
+
+ mount -t msdosfs /dev/md${mdstart}$part $mntpoint || exit 1
+ ls -lR $mntpoint
+ umount $mntpoint
+fi
+mdconfig -d -u $mdstart
+rm /tmp/msdos8 $log
+exit $s
+EOF
+#include <sys/param.h>
+#include <sys/stat.h>
+#include <sys/wait.h>
+
+#include <err.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <unistd.h>
+
+# define PARALLEL 10
+
+static unsigned long size;
+
+static void
+test(void)
+{
+ pid_t pid;
+ int fd, i, j;
+ char file1[128], file2[128];
+
+ pid = getpid();
+ for (i = 0; i < (int)size; i++) {
+ sprintf(file1,"p%05d.%05d", pid, i);
+ if ((fd = open(file1, O_RDONLY|O_CREAT, 0660)) == -1)
+ err(1, "openat(%s), %s:%d", file1, __FILE__,
+ __LINE__);
+ close(fd);
+ }
+ for (j = 0; j < 100; j++) {
+ for (i = 0; i < (int)size; i++) {
+ sprintf(file1,"p%05d.%05d", pid, i);
+ sprintf(file2,"p%05d.%05d.togo", pid, i);
+ if (rename(file1, file2) == -1)
+ err(1, "rename(%s, %s). %s:%d", file1,
+ file2, __FILE__, __LINE__);
+ }
+ for (i = 0; i < (int)size; i++) {
+ sprintf(file1,"p%05d.%05d", pid, i);
+ sprintf(file2,"p%05d.%05d.togo", pid, i);
+ if (rename(file2, file1) == -1)
+ err(1, "rename(%s, %s). %s:%d", file2,
+ file1, __FILE__, __LINE__);
+ }
+ }
+
+ for (i = 0; i < (int)size; i++) {
+ sprintf(file1,"p%05d.%05d", pid, i);
+ if (unlink(file1) == -1)
+ err(1, "unlink(%s), %s:%d", file1, __FILE__,
+ __LINE__);
+ }
+ _exit(0);
+}
+
+int
+main(void)
+{
+ pid_t pids[PARALLEL];
+ time_t start;
+ int e, i, status;
+
+ e = 0;
+ size = 5;
+ start = time(NULL);
+ while ((time(NULL) - start) < 60 && e == 0) {
+ for (i = 0; i < PARALLEL; i++) {
+ if ((pids[i] = fork()) == 0)
+ test();
+ if (pids[i] == -1)
+ err(1, "fork()");
+ }
+ for (i = 0; i < PARALLEL; i++) {
+ if (waitpid(pids[i], &status, 0) == -1)
+ err(1, "waitpid(%d)", pids[i]);
+ if (WIFSIGNALED(status))
+ fprintf(stderr, "pid %d exit signal %d\n",
+ pids[i], WTERMSIG(status));
+ e += status == 0 ? 0 : 1;
+ }
+ }
+
+ return (e);
+}
From owner-svn-src-user@freebsd.org Sat Sep 23 13:37:03 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 D05C9E0583E
for <svn-src-user@mailman.ysv.freebsd.org>;
Sat, 23 Sep 2017 13:37:03 +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 9E61673609;
Sat, 23 Sep 2017 13:37:03 +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 v8NDb2x8057974;
Sat, 23 Sep 2017 13:37:02 GMT (envelope-from pho@FreeBSD.org)
Received: (from pho@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8NDb27a057972;
Sat, 23 Sep 2017 13:37:02 GMT (envelope-from pho@FreeBSD.org)
Message-Id: <201709231337.v8NDb27a057972@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: Sat, 23 Sep 2017 13:37:02 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r323953 - 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: 323953
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" <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: Sat, 23 Sep 2017 13:37:03 -0000
Author: pho
Date: Sat Sep 23 13:37:02 2017
New Revision: 323953
URL: https://svnweb.freebsd.org/changeset/base/323953
Log:
No need to use grep(1).
Sponsored by: Dell EMC Isilon
Modified:
user/pho/stress2/misc/marcus2.sh
user/pho/stress2/misc/marcus5.sh
Modified: user/pho/stress2/misc/marcus2.sh
==============================================================================
--- user/pho/stress2/misc/marcus2.sh Sat Sep 23 12:44:42 2017 (r323952)
+++ user/pho/stress2/misc/marcus2.sh Sat Sep 23 13:37:02 2017 (r323953)
@@ -49,7 +49,7 @@ export runRUNTIME=20m
export RUNDIR=$mntpoint/stressX
n=`find ../testcases -perm -1 -type f | wc -l`
-m=`su $testuser -c "limits | grep maxprocesses | awk '{print \\$NF}'"`
+m=`su $testuser -c "limits | awk '/maxprocesses/ {print \\$NF}'"`
export INCARNATIONS=$((m / n))
export swapINCARNATIONS=$INCARNATIONS
Modified: user/pho/stress2/misc/marcus5.sh
==============================================================================
--- user/pho/stress2/misc/marcus5.sh Sat Sep 23 12:44:42 2017 (r323952)
+++ user/pho/stress2/misc/marcus5.sh Sat Sep 23 13:37:02 2017 (r323953)
@@ -53,7 +53,7 @@ size=$((`sysctl -n hw.physmem` / 1024 / 1024))
{ echo "deadlkres must be disabled for this test."; exit 0; }
n=`find ../testcases -perm -1 -type f | wc -l`
-m=`su $testuser -c "limits | grep maxprocesses | awk '{print \\$NF}'"`
+m=`su $testuser -c "limits | awk '/maxprocesses/ {print \\$NF}'"`
export RUNDIR=$mntpoint/stressX
export INCARNATIONS=$((m / n))