git: 22f5f4a14e97 - main - stress2: Added new msdosfs rename() tests

Peter Holm pho at FreeBSD.org
Sun Aug 29 06:38:41 UTC 2021


The branch main has been updated by pho:

URL: https://cgit.FreeBSD.org/src/commit/?id=22f5f4a14e976a9b322ea4abf8af5afe6520ff8e

commit 22f5f4a14e976a9b322ea4abf8af5afe6520ff8e
Author:     Peter Holm <pho at FreeBSD.org>
AuthorDate: 2021-08-29 06:37:54 +0000
Commit:     Peter Holm <pho at FreeBSD.org>
CommitDate: 2021-08-29 06:37:54 +0000

    stress2: Added new msdosfs rename() tests
---
 tools/test/stress2/misc/msdos11.sh |  80 +++++++++++++++++++++++++
 tools/test/stress2/misc/msdos12.sh |  89 +++++++++++++++++++++++++++
 tools/test/stress2/misc/msdos13.sh |  97 ++++++++++++++++++++++++++++++
 tools/test/stress2/misc/msdos14.sh | 119 +++++++++++++++++++++++++++++++++++++
 tools/test/stress2/misc/nfs18.sh   |  90 ++++++++++++++++++++++++++++
 5 files changed, 475 insertions(+)

diff --git a/tools/test/stress2/misc/msdos11.sh b/tools/test/stress2/misc/msdos11.sh
new file mode 100755
index 000000000000..af0958686118
--- /dev/null
+++ b/tools/test/stress2/misc/msdos11.sh
@@ -0,0 +1,80 @@
+#!/bin/sh
+
+#
+# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+#
+# Copyright (c) 2021 Peter Holm
+#
+# 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.
+#
+
+# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=257522
+# https://people.freebsd.org/~pho/stress/log/log0158.txt
+# Original test scenario by trasz at FreeBSD.org
+
+. ../default.cfg
+[ `id -u` -ne 0 ] && echo "Must be root!" && exit 1
+
+[ -x /sbin/mount_msdosfs ] || exit 0
+log=/tmp/msdos11.log
+dir=/tmp
+odir=`pwd`
+cd $dir
+cd $odir
+mount | grep "$mntpoint" | grep -q md$mdstart && umount -f $mntpoint
+mdconfig -l | grep -q $mdstart &&  mdconfig -d -u $mdstart
+
+set -e
+mdconfig -a -t swap -s 4g -u $mdstart
+bsdlabel -w md$mdstart auto
+newfs_msdos -b 1024 /dev/md${mdstart}$part > /dev/null
+mount -t msdosfs /dev/md${mdstart}$part $mntpoint
+set +e
+
+(cd $odir/../testcases/swap; ./swap -t 2m -i 20 -l 100) > /dev/null &
+sleep 2
+cd $mntpoint
+for i in `jot 2`; do
+	for i in `jot 10000`; do
+		mkdir a
+		mv a b
+		rmdir b
+	done > /dev/null 2>&1 &
+done
+wait
+cd $odir
+
+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 $log
+exit $s
diff --git a/tools/test/stress2/misc/msdos12.sh b/tools/test/stress2/misc/msdos12.sh
new file mode 100755
index 000000000000..0c1c518575e8
--- /dev/null
+++ b/tools/test/stress2/misc/msdos12.sh
@@ -0,0 +1,89 @@
+#!/bin/sh
+
+#
+# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+#
+# Copyright (c) 2021 Peter Holm
+#
+# 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.
+#
+
+[ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1
+
+# Copy of rename15.sh, modified for msdosfs.
+
+. ../default.cfg
+
+[ -x /sbin/mount_msdosfs ] || exit 0
+log=/tmp/msdos12.log
+
+set -e
+mount | grep "on $mntpoint " | grep -q /dev/md && umount -f $mntpoint
+[ -c /dev/md$mdstart ] &&  mdconfig -d -u $mdstart
+mdconfig -a -t swap -s 2g -u $mdstart
+bsdlabel -w md$mdstart auto
+newfs_msdos -F 32 -b 8192 /dev/md$mdstart$part > /dev/null
+mount -t msdosfs /dev/md$mdstart$part $mntpoint
+mkdir $mntpoint/stressX
+chmod 0777 $mntpoint/stressX
+set +e
+
+export LOAD=80
+export MAXSWAPPCT=80
+export RUNDIR=$mntpoint/stressX
+export dirnprenameLOAD=100
+export dirrenameLOAD=100
+export renameLOAD=100
+export runRUNTIME=5m
+export rwLOAD=80
+export TESTPROGS='
+testcases/rename/rename
+testcases/swap/swap
+'
+
+su $testuser -c 'cd ..; ./testcases/run/run $TESTPROGS'
+
+../tools/killall.sh
+leftover=`find $mntpoint -type f | wc -l`
+if [ $leftover -gt 0 ]; then
+	s=1
+	find $mntpoint -type f | head -5
+fi
+for i in `jot 6`; do
+	mount | grep -q "on $mntpoint " || break
+	umount $mntpoint && break || sleep 10
+	[ $i -eq 6 ] &&
+	    { echo FATAL; fstat -mf $mntpoint; exit 1; }
+done
+fsck -t msdosfs -y /dev/md$mdstart$part > $log 2>&1
+if egrep -q "BAD|INCONSISTENCY|MODIFIED" $log; then
+	echo "fsck problems:"
+	cat $log
+	s=2
+
+	mount -t msdosfs /dev/md$mdstart$part $mntpoint || exit 1
+	ls -lR $mntpoint | head -5
+	umount $mntpoint
+fi
+mdconfig -d -u $mdstart
+rm -f $log
+exit $s
diff --git a/tools/test/stress2/misc/msdos13.sh b/tools/test/stress2/misc/msdos13.sh
new file mode 100755
index 000000000000..1e6ee205e4f6
--- /dev/null
+++ b/tools/test/stress2/misc/msdos13.sh
@@ -0,0 +1,97 @@
+#!/bin/sh
+
+#
+# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+#
+# Copyright (c) 2021 Peter Holm
+#
+# 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.
+#
+
+# Simple msdosfs rename example
+
+[ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1
+
+. ../default.cfg
+
+[ -x /sbin/mount_msdosfs ] || exit 0
+log=/tmp/msdos13.log
+
+set -e
+mount | grep "on $mntpoint " | grep -q /dev/md && umount -f $mntpoint
+[ -c /dev/md$mdstart ] &&  mdconfig -d -u $mdstart
+mdconfig -a -t swap -s 2g -u $mdstart
+bsdlabel -w md$mdstart auto
+newfs_msdos -F 32 -b 8192 /dev/md$mdstart$part > /dev/null
+mount -t msdosfs /dev/md$mdstart$part $mntpoint
+mkdir $mntpoint/stressX
+chmod 0777 $mntpoint/stressX
+set +e
+
+here=`pwd`
+cd $mntpoint/stressX
+N=4000
+s=0
+sort /dev/zero & pid=$!
+sleep 2
+for j in `jot $N`; do
+	touch f$i-$j
+done
+for j in `jot $N`; do
+	mv f$i-$j g$i-$j
+	[ -f f$i-$j ] && s=1
+done
+for j in `jot $N`; do
+	mv g$i-$j f$i-$j
+done
+for j in `jot $N`; do
+	rm f$i-$j
+done
+kill $pid
+wait
+leftover=`find . -type f | wc -l`
+if [ $leftover -gt 0 ]; then
+	echo "Unexpected leftover files:"
+	s=2
+	find . -type f | head -5
+fi
+cd $here
+
+for i in `jot 6`; do
+	mount | grep -q "on $mntpoint " || break
+	umount $mntpoint && break || sleep 10
+	[ $i -eq 6 ] &&
+	    { echo FATAL; fstat -mf $mntpoint; exit 1; }
+done
+fsck -t msdosfs -y /dev/md$mdstart$part > $log 2>&1
+if egrep -q "BAD|INCONSISTENCY|MODIFIED" $log; then
+	echo "fsck problems:"
+	cat $log
+	s=3
+
+	mount -t msdosfs /dev/md$mdstart$part $mntpoint || exit 1
+	ls -lR $mntpoint | head -5
+	umount $mntpoint
+fi
+mdconfig -d -u $mdstart
+rm -f $log
+exit $s
diff --git a/tools/test/stress2/misc/msdos14.sh b/tools/test/stress2/misc/msdos14.sh
new file mode 100755
index 000000000000..1a39d60f0781
--- /dev/null
+++ b/tools/test/stress2/misc/msdos14.sh
@@ -0,0 +1,119 @@
+#!/bin/sh
+
+#
+# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+#
+# Copyright (c) 2021 Peter Holm
+#
+# 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.
+#
+
+# Rename(2) test with msdosfs(5)
+# Test scenario by kib@
+
+. ../default.cfg
+[ `id -u` -ne 0 ] && echo "Must be root!" && exit 1
+
+[ -x /sbin/mount_msdosfs ] || exit 0
+dir=/tmp
+odir=`pwd`
+cd $dir
+cat > /tmp/msdos14.c <<EOF
+/* $Id: rename.c,v 1.2 2021/08/22 15:35:38 kostik Exp kostik $ */
+
+#include <sys/stat.h>
+#include <err.h>
+#include <fcntl.h>
+#include <inttypes.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <unistd.h>
+
+int
+main(void)
+{
+	struct stat sb;
+	uint64_t x;
+	int error, fd;
+	char from[64], to[64];
+
+	for (x = 0;; x++) {
+		snprintf(from, sizeof(from), "x.%" PRIu64 ".from", x);
+		snprintf(to, sizeof(to), "x.%" PRIu64 ".to", x);
+
+		fd = open(from, O_CREAT | O_TRUNC | O_EXCL, 0666);
+		if (fd == -1)
+			err(1, "open %s", from);
+		close(fd);
+		error = rename(from, to);
+		if (error == -1)
+			err(1, "rename %s %s", from, to);
+		error = stat(to, &sb);
+		if (error == -1)
+			err(1, "stat %s", to);
+		error = unlink(to);
+		if (error == -1)
+			err(1, "unlink %s", to);
+	}
+}
+
+EOF
+cc -o msdos14	 -Wall -Wextra -O2 msdos14.c || exit 1
+rm -f msdos14.c
+cd $odir
+log=/tmp/msdos14sh..log
+mount | grep "$mntpoint" | grep -q md$mdstart && umount -f $mntpoint
+mdconfig -l | grep -q $mdstart &&  mdconfig -d -u $mdstart
+
+set -e
+mdconfig -a -t swap -s 4g -u $mdstart
+bsdlabel -w md$mdstart auto
+newfs_msdos -b 1024 /dev/md${mdstart}$part > /dev/null
+mount -t msdosfs /dev/md${mdstart}$part $mntpoint
+set +e
+
+cp /tmp/msdos14 $mntpoint
+cd $mntpoint
+
+(cd $odir/../testcases/swap; ./swap -t 5m -i 20 -l 100) > /dev/null &
+sleep 2
+timeout 5m ./msdos14
+while pkill swap; do :; done
+wait
+cd $odir
+
+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
+	echo "fsck issues:"
+	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/msdos14 $log
+exit $s
diff --git a/tools/test/stress2/misc/nfs18.sh b/tools/test/stress2/misc/nfs18.sh
new file mode 100755
index 000000000000..bf9e0fc8010e
--- /dev/null
+++ b/tools/test/stress2/misc/nfs18.sh
@@ -0,0 +1,90 @@
+#!/bin/sh
+
+#
+# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+#
+# Copyright (c) 2021 Peter Holm
+#
+# 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.
+#
+
+# msdosfs rename test over nfs loopback mount
+# This needs to be in /etc/exports: /mnt -maproot=root 127.0.0.1
+
+. ../default.cfg
+
+[ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1
+mp1=$mntpoint
+mp2=$mntpoint$((mdstart + 1))
+grep -q $mp1 /etc/exports ||
+	{ echo "$mp1 missing from /etc/exports"; exit 0; }
+[ -x /sbin/mount_msdosfs ] || exit
+
+mount | grep "$mp2 " | grep nfs > /dev/null && umount -f $mp2
+mount | grep "$mp1 " | grep /md > /dev/null && umount -f $mp1
+mdconfig -l | grep -q $mdstart && mdconfig -d -u $mdstart
+
+kill -HUP `pgrep mountd` # loopback workaround
+mdconfig -a -t swap -s 1g -u $mdstart
+set -e
+
+bsdlabel -w md$mdstart auto
+newfs_msdos -F 32 -b 8192 /dev/md${mdstart}$part > /dev/null
+mkdir -p $mp1; chmod 777 $mp1
+mount -t msdosfs -o rw /dev/md${mdstart}$part $mp1
+set +e
+
+mkdir $mp1/stressX
+chmod 777 $mp1/stressX
+
+mkdir -p $mp2
+chmod 777 $mp2
+
+mount -t nfs -o tcp -o retrycnt=3 -o rw \
+    127.0.0.1:$mp1 $mp2; s=$?
+
+export LOAD=80
+export renameLOAD=100
+export TESTPROGS="
+testcases/rename/rename
+testcases/swap/swap
+"
+export INODES=9999		# No inodes on a msdos fs
+
+export RUNDIR=$mp2/stressX
+export runRUNTIME=2m
+if [ $s -eq 0 ]; then
+	su $testuser -c 'cd ..; ./testcases/run/run $TESTPROGS'
+
+	for i in `jot 10`; do
+		umount $mp2 && break
+		sleep 2
+	done
+fi
+sleep .5
+for i in `jot 10`; do
+	umount $mp1 && break
+	sleep 2
+done
+mount | grep -q "on $mp1 " && umount -f $mp1
+mdconfig -d -u $mdstart
+exit 0


More information about the dev-commits-src-all mailing list