Skip to contentSkip to conversation

btrfs-progs: tests: Move extract_image out of check_all_images for common use

PATCH In review Zhao Lei 2 participants 6 messages Sep 23, 2015 Btrfs file system

lore
Share & tools
lore

Zhao Lei

author
#0 lore raw

v2 cover btrfs-progs: tests: Move extract_image out of check_all_images for common use

Move code for extract image file to a function from check_all_images() for common use, so caller can use this function to extrace single image file.

Changelog v1->v2:
1: Use stdout instead of global variant to store extracted image filename.

Zhao Lei (3):
btrfs-progs: tests: Move extract_image out of check_all_images for
common use
btrfs-progs: tests: Introduce fsck-tests/018-leaf-across-stripes
btrfs-progs: tests: Introduce misc-tests/008-leaf-across-stripes

 tests/common                                       |  76 ++++++++++++---------
 .../018-leaf-across-stripes/default_case.raw.xz    | Bin 0 -> 105064 bytes
 tests/fsck-tests/018-leaf-across-stripes/test.sh   |  12 ++++
 tests/misc-tests/008-leaf-across-stripes/test.sh   |  23 +++++++
 4 files changed, 78 insertions(+), 33 deletions(-)
 create mode 100644 tests/fsck-tests/018-leaf-across-stripes/default_case.raw.xz
 create mode 100755 tests/fsck-tests/018-leaf-across-stripes/test.sh
 create mode 100755 tests/misc-tests/008-leaf-across-stripes/test.sh
Signature · 1 line
1.8.5.1
author
#1 lore raw

PATCH v2 1/3 btrfs-progs: tests: Move extract_image out of check_all_images for common use

Move code for extract image file to a function from check_all_images() for common use, so caller can use this function to extrace single image file.

---
 tests/common | 76 ++++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 43 insertions(+), 33 deletions(-)
tests/common +43 -33
index 63b0d9f..320c4dd 100644
@@ -62,6 +62,44 @@ check_image()
 	run_check $TOP/btrfs check $image
 }
 
+extract_image()
+{
+	local image="$1"
+
+	local cleanme=
+	case "$image" in
+	*.img)
+		rm -f $image.restored
+		: ;;
+	*.img.xz)
+		xz --decompress --keep "$image" || \
+			_fail "failed to decompress image $image" >&2
+		image=${image%%.xz}
+		rm -f $image.restored
+		cleanme=$image
+		;;
+	*.raw)
+		cp --sparse=auto $image $image.restored
+		;;
+	*.raw.xz)
+		xz --decompress --keep "$image" || \
+			_fail "failed to decompress image $image" >&2
+		image=${image%%.xz}
+		mv "$image" "$image".restored
+		;;
+	esac
+
+	if ! [ -f $image.restored ]; then
+		echo "restoring image $(basename $image)" >> $RESULTS
+		$TOP/btrfs-image -r $image $image.restored || \
+			_fail "failed to restore image $image" >&2
+	fi
+
+	[[ "$cleanme" ]] && rm -f "$cleanme"
+
+	echo "$image.restored"
+}
+
 # Process all image dumps in a given directory,
 # - raw btrfs filesystem images, suffix .raw
 # - dtto compressed by XZ, suffix .raw.xz
@@ -69,44 +107,16 @@ check_image()
 # - dtto compressed by XZ, suffix .img.xz
 check_all_images()
 {
-	dir=$1
+	local dir=$1
 	for image in $(find $dir \( -iname '*.img' -o	\
 				-iname '*.img.xz' -o 	\
 				-iname '*.raw' -o 	\
 				-iname '*.raw.xz' \) | sort)
 	do
-		cleanme=
-		case "$image" in
-		*.img)
-			rm -f $image.restored
-			: ;;
-		*.img.xz)
-			xz --decompress --keep "$image" || \
-				_fail "failed to decompress image $image"
-			image=${image%%.xz}
-			rm -f $image.restored
-			cleanme=$image
-			;;
-		*.raw)
-			cp --sparse=auto $image $image.restored
-			;;
-		*.raw.xz)
-			xz --decompress --keep "$image" || \
-				_fail "failed to decompress image $image"
-			image=${image%%.xz}
-			mv "$image" "$image".restored
-			;;
-		esac
-
-		if ! [ -f $image.restored ]; then
-			echo "restoring image $(basename $image)" >> $RESULTS
-			$TOP/btrfs-image -r $image $image.restored || \
-				_fail "failed to restore image $image"
-		fi
-
-		check_image $image.restored
-
-		rm -f $image.restored $cleanme
+		local extracted
+		extracted=$(extract_image "$image")
+		check_image "$extracted"
+		rm -f "$extracted"
 	done
 }
 
Signature · 1 line
1.8.5.1
author
#2 lore raw

PATCH v2 2/3 btrfs-progs: tests: Introduce fsck-tests/018-leaf-across-stripes

In reply to Zhao Lei

To test is fsck can check "leaf across stripes" case.

This function was introduced from patch titled:
btrfs-progs: fsck: Check if a metadata tree block crossing stripe boundary

---
 .../018-leaf-across-stripes/default_case.raw.xz        | Bin 0 -> 105064 bytes
 tests/fsck-tests/018-leaf-across-stripes/test.sh       |  12 ++++++++++++
 2 files changed, 12 insertions(+)
 create mode 100644 tests/fsck-tests/018-leaf-across-stripes/default_case.raw.xz
 create mode 100755 tests/fsck-tests/018-leaf-across-stripes/test.sh
tests/fsck-tests/018-leaf-across-stripes/default_case.raw.xz new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..60eb2f978a4c37b000b650ddcb06219eadac9e68
GIT binary patch
tests/fsck-tests/018-leaf-across-stripes/test.sh new file +12 -0
new file mode 100755
index 0000000..d799a34
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+source $TOP/tests/common
+
+check_prereq btrfs
+
+image=$(extract_image "./default_case.raw.xz")
+$TOP/btrfs check "$image" 2>&1 |
+	grep -q "crossing stripe boundary" ||
+	_fail "no expected error message in output"
+
+rm -f "$image"
Signature · 1 line
1.8.5.1
#3 lore raw

Re: [PATCH v2 2/3] btrfs-progs: tests: Introduce fsck-tests/018-leaf-across-stripes

tests/fsck-tests/018-leaf-across-stripes/test.sh line 8

Quoted 3 lines · Zhao Lei
tests/fsck-tests/018-leaf-across-stripes/test.sh new file +3 -0
+
+image=$(extract_image "./default_case.raw.xz")
+$TOP/btrfs check "$image" 2>&1 |

It's better to use 'run_check_stdout' here as this will store the output to the log as well. I've fixed that and applied, thanks.

Quoted 4 lines
tests/fsck-tests/018-leaf-across-stripes/test.sh new file +4 -0
+	grep -q "crossing stripe boundary" ||
+	_fail "no expected error message in output"
+
+rm -f "$image"
author
#4 lore raw

PATCH v2 3/3 btrfs-progs: tests: Introduce misc-tests/008-leaf-across-stripes

In reply to Zhao Lei

To check is btrfs-convert create bad filesystem with leaf across stripes.

It is happened in progs version <=v4.1.2, and fixed by patch titled:
btrfs: convert: Avoid allocating metadata extent crossing stripe boundary which was merged in v4.2.

Notice thar this testcase can not report error in old version of btrfs-progs, because "btrfs check" can't check this type of error in those version, but we have another testcase in fsck-tests, to check is "btrfs check" support this check.

So, use above 2 testcase together can check out leaf-across-stripes bug in all version.

---
 tests/misc-tests/008-leaf-across-stripes/test.sh | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100755 tests/misc-tests/008-leaf-across-stripes/test.sh
tests/misc-tests/008-leaf-across-stripes/test.sh new file +23 -0
new file mode 100755
index 0000000..cd426a9
@@ -0,0 +1,23 @@
+#!/bin/bash
+# test btrfs-convert create filesystem without leaf across stripes
+
+source $TOP/tests/common
+
+check_prereq btrfs-convert
+check_prereq btrfs
+
+# In my test, it happened in 514M~560M, 737M~769M, 929M~917M,
+# and HAVE_ERROR=((size + 1) / 2) % 2 if size >= 970
+#
+SIZE_FROM=514
+SIZE_END=560
+A_PRIME_NUM=17
+for ((size = SIZE_FROM; size <= SIZE_END; size += A_PRIME_NUM)); do
+	run_check truncate -s "$size"M "$IMAGE"
+	run_check mkfs.ext4 -F "$IMAGE"
+	run_check $TOP/btrfs-convert "$IMAGE"
+	$TOP/btrfs check "$IMAGE" 2>&1 | grep "crossing stripe boundary" &&
+		_fail "leaf across stripes in btrfs-convert"
+done
+
+exit 0
Signature · 1 line
1.8.5.1
#5 lore raw
In reply to Zhao Lei
Quoted 5 lines · Zhao Lei

Zhao Lei (3):
btrfs-progs: tests: Move extract_image out of check_all_images for
common use
btrfs-progs: tests: Introduce fsck-tests/018-leaf-across-stripes
btrfs-progs: tests: Introduce misc-tests/008-leaf-across-stripes

All applied, with some minor tweaks, thanks!