diff mbox series

ext4: add test to validate the large_dir feature

Message ID 20210805144016.3556979-1-tytso@mit.edu (mailing list archive)
State New, archived
Headers show
Series ext4: add test to validate the large_dir feature | expand

Commit Message

Theodore Ts'o Aug. 5, 2021, 2:40 p.m. UTC 
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
---
 src/dirstress.c    |  7 +++++-
 tests/ext4/051     | 62 ++++++++++++++++++++++++++++++++++++++++++++++
 tests/ext4/051.out |  2 ++
 3 files changed, 70 insertions(+), 1 deletion(-)
 create mode 100755 tests/ext4/051
 create mode 100644 tests/ext4/051.out

Comments

Eryu Guan Aug. 8, 2021, 1:57 p.m. UTC | #1 
On Thu, Aug 05, 2021 at 10:40:16AM -0400, Theodore Ts'o wrote:
> Signed-off-by: Theodore Ts'o <tytso@mit.edu>

I think it'd be better to explain large_dir feature a bit, and describe
the test, how it's supposed to test this feature.

> ---
>  src/dirstress.c    |  7 +++++-
>  tests/ext4/051     | 62 ++++++++++++++++++++++++++++++++++++++++++++++
>  tests/ext4/051.out |  2 ++
>  3 files changed, 70 insertions(+), 1 deletion(-)
>  create mode 100755 tests/ext4/051
>  create mode 100644 tests/ext4/051.out
> 
> diff --git a/src/dirstress.c b/src/dirstress.c
> index 615cb6e3..ec28d643 100644
> --- a/src/dirstress.c
> +++ b/src/dirstress.c
> @@ -16,6 +16,7 @@ int verbose;
>  int pid;
>  
>  int checkflag=0;
> +int create_only=0;
>  
>  #define MKNOD_DEV 0
>  
> @@ -51,7 +52,7 @@ main(
>  	nprocs_per_dir = 1;
>  	keep = 0;
>          verbose = 0;
> -	while ((c = getopt(argc, argv, "d:p:f:s:n:kvc")) != EOF) {
> +	while ((c = getopt(argc, argv, "d:p:f:s:n:kvcC")) != EOF) {
>  		switch(c) {
>  			case 'p':
>  				nprocs = atoi(optarg);
> @@ -80,6 +81,9 @@ main(
>  			case 'c':
>                                  checkflag++;
>                                  break;
> +			case 'C':
> +				create_only++;
> +				break;
>  		}
>  	}
>  	if (errflg || (dirname == NULL)) {
> @@ -170,6 +174,7 @@ dirstress(
>  	if (create_entries(nfiles)) {
>              printf("!! [%d] create failed\n", pid);
>          } else {
> +	    if (create_only) return 0;
>              if (verbose) fprintf(stderr,"** [%d] scramble entries\n", pid);
>  	    if (scramble_entries(nfiles)) {
>                  printf("!! [%d] scramble failed\n", pid);
> diff --git a/tests/ext4/051 b/tests/ext4/051
> new file mode 100755
> index 00000000..387e2518
> --- /dev/null
> +++ b/tests/ext4/051
> @@ -0,0 +1,62 @@
> +#! /bin/bash
> +# SPDX-License-Identifier: GPL-2.0
> +#
> +# FS QA Test 051
> +#
> +# Test ext4's large_dir feature
> +#
> +. ./common/preamble
> +_begin_fstest auto quick dir
> +
> +# Override the default cleanup function.
> +_cleanup()
> +{
> +	cd /
> +	rm -r -f $tmp.*
> +	if [ ! -z "$loop_mnt" ]; then
> +		$UMOUNT_PROG $loop_mnt
> +		rm -rf $loop_mnt
> +	fi
> +	[ ! -z "$fs_img" ] && rm -rf $fs_img
> +}
> +
> +# Import common functions.
> +# . ./common/filter
> +
> +# real QA test starts here
> +
> +# Modify as appropriate.
> +_supported_fs ext4
> +_require_test
> +_require_loop
> +_require_scratch_ext4_feature "large_dir"
> +
> +echo "Silence is golden"
> +
> +loop_mnt=$TEST_DIR/$seq.mnt
> +fs_img=$TEST_DIR/$seq.img
> +status=0
> +
> +cp /dev/null $fs_img

Just a nit, we usually do

$XFS_IO_PROG -f -c "truncate 40G" $fs_img >>$seqres.full 2>&1

> +${MKFS_PROG} -t ${FSTYP} -b 1024 -N 600020 -O large_dir,^has_journal \
> +	     $fs_img 40G >> $seqres.full 2>&1 || _fail "mkfs failed"

Better to describe the mkfs options used here, e.g. why using 1k
blocksize, 600020 inodes, and without journal.

> +
> +mkdir -p $loop_mnt
> +_mount -o loop $fs_img $loop_mnt > /dev/null  2>&1 || \
> +	_fail "Couldn't do initial mount"
> +
> +/root/xfstests/src/dirstress -c -d /tmpmnt -p 1 -f 400000 -C \
> +	>> $seqres.full 2>&1

Use $here/src/dirstress as below. And /tmpmnt is not used elsewhere. Is
this a debug line that should be removed?

> +
> +if ! $here/src/dirstress -c -d $loop_mnt -p 1 -f 400000 -C >$tmp.out 2>&1
> +then
> +    echo "    dirstress failed"
> +    cat $tmp.out >> $seqres.full
> +    echo "    dirstress failed" >> $seqres.full
> +    status=1
> +fi
> +
> +$UMOUNT_PROG $loop_mnt || _fail "umount failed"
> +loop_mnt=
> +
> +$E2FSCK_PROG -fn $fs_img >> $seqres.full 2>&1 || _fail "file system corrupted"

Better to have an explicit "exit" at the end of test, like all other
tests do.

Thanks,
Eryu

> diff --git a/tests/ext4/051.out b/tests/ext4/051.out
> new file mode 100644
> index 00000000..32f74d89
> --- /dev/null
> +++ b/tests/ext4/051.out
> @@ -0,0 +1,2 @@
> +QA output created by 051
> +Silence is golden
> -- 
> 2.31.0
diff mbox series

Patch

diff --git a/src/dirstress.c b/src/dirstress.c
index 615cb6e3..ec28d643 100644
--- a/src/dirstress.c
+++ b/src/dirstress.c
@@ -16,6 +16,7 @@  int verbose;
 int pid;
 
 int checkflag=0;
+int create_only=0;
 
 #define MKNOD_DEV 0
 
@@ -51,7 +52,7 @@  main(
 	nprocs_per_dir = 1;
 	keep = 0;
         verbose = 0;
-	while ((c = getopt(argc, argv, "d:p:f:s:n:kvc")) != EOF) {
+	while ((c = getopt(argc, argv, "d:p:f:s:n:kvcC")) != EOF) {
 		switch(c) {
 			case 'p':
 				nprocs = atoi(optarg);
@@ -80,6 +81,9 @@  main(
 			case 'c':
                                 checkflag++;
                                 break;
+			case 'C':
+				create_only++;
+				break;
 		}
 	}
 	if (errflg || (dirname == NULL)) {
@@ -170,6 +174,7 @@  dirstress(
 	if (create_entries(nfiles)) {
             printf("!! [%d] create failed\n", pid);
         } else {
+	    if (create_only) return 0;
             if (verbose) fprintf(stderr,"** [%d] scramble entries\n", pid);
 	    if (scramble_entries(nfiles)) {
                 printf("!! [%d] scramble failed\n", pid);
diff --git a/tests/ext4/051 b/tests/ext4/051
new file mode 100755
index 00000000..387e2518
--- /dev/null
+++ b/tests/ext4/051
@@ -0,0 +1,62 @@ 
+#! /bin/bash
+# SPDX-License-Identifier: GPL-2.0
+#
+# FS QA Test 051
+#
+# Test ext4's large_dir feature
+#
+. ./common/preamble
+_begin_fstest auto quick dir
+
+# Override the default cleanup function.
+_cleanup()
+{
+	cd /
+	rm -r -f $tmp.*
+	if [ ! -z "$loop_mnt" ]; then
+		$UMOUNT_PROG $loop_mnt
+		rm -rf $loop_mnt
+	fi
+	[ ! -z "$fs_img" ] && rm -rf $fs_img
+}
+
+# Import common functions.
+# . ./common/filter
+
+# real QA test starts here
+
+# Modify as appropriate.
+_supported_fs ext4
+_require_test
+_require_loop
+_require_scratch_ext4_feature "large_dir"
+
+echo "Silence is golden"
+
+loop_mnt=$TEST_DIR/$seq.mnt
+fs_img=$TEST_DIR/$seq.img
+status=0
+
+cp /dev/null $fs_img
+${MKFS_PROG} -t ${FSTYP} -b 1024 -N 600020 -O large_dir,^has_journal \
+	     $fs_img 40G >> $seqres.full 2>&1 || _fail "mkfs failed"
+
+mkdir -p $loop_mnt
+_mount -o loop $fs_img $loop_mnt > /dev/null  2>&1 || \
+	_fail "Couldn't do initial mount"
+
+/root/xfstests/src/dirstress -c -d /tmpmnt -p 1 -f 400000 -C \
+	>> $seqres.full 2>&1
+
+if ! $here/src/dirstress -c -d $loop_mnt -p 1 -f 400000 -C >$tmp.out 2>&1
+then
+    echo "    dirstress failed"
+    cat $tmp.out >> $seqres.full
+    echo "    dirstress failed" >> $seqres.full
+    status=1
+fi
+
+$UMOUNT_PROG $loop_mnt || _fail "umount failed"
+loop_mnt=
+
+$E2FSCK_PROG -fn $fs_img >> $seqres.full 2>&1 || _fail "file system corrupted"
diff --git a/tests/ext4/051.out b/tests/ext4/051.out
new file mode 100644
index 00000000..32f74d89
--- /dev/null
+++ b/tests/ext4/051.out
@@ -0,0 +1,2 @@ 
+QA output created by 051
+Silence is golden