Skip to contentSkip to conversation

btrfs-progs: tests: Extend metadata uuid testcase

PATCH Applied Nikolay Borisov 2 participants 2 messages Jan 10, 2020 – Jan 13, 2020 Btrfs file system

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 btrfs-progs: tests: Extend metadata uuid testcase

This adds cooked images to exercise the case when a filesystem with metadata uuid incompat flag is switched back to having fsid/metadata uuid being equal.

---
 tests/misc-tests/034-metadata-uuid/disk7.raw.xz | Bin 0 -> 314456 bytes
 tests/misc-tests/034-metadata-uuid/disk8.raw.xz | Bin 0 -> 313708 bytes
 tests/misc-tests/034-metadata-uuid/test.sh      |  25 ++++++++++++++++++++++++
 3 files changed, 25 insertions(+)
 create mode 100644 tests/misc-tests/034-metadata-uuid/disk7.raw.xz
 create mode 100644 tests/misc-tests/034-metadata-uuid/disk8.raw.xz
tests/misc-tests/034-metadata-uuid/disk7.raw.xz new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..131d49718de95e9c0212082298e9b5e539c8deea
GIT binary patch
tests/misc-tests/034-metadata-uuid/disk8.raw.xz new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..993c836eeba1d0139e083d9a334041b93c172afa
GIT binary patch
tests/misc-tests/034-metadata-uuid/test.sh +25 -0
index 6ac55b1cacfa..2b7c659998cf 100755
@@ -155,11 +155,27 @@ check_completed() {
 	[ $? -eq 0 ] || _fail "metadata_uuid not set on $2"
 }
 
+check_flag_cleared() {
+	# Ensure METADATA_UUID is not set. 
+	run_check_stdout $SUDO_HELPER "$TOP/btrfs" inspect-internal dump-super \
+		"$1" | grep -q METADATA_UUID
+	[ $? -eq 1 ] || _fail "metadata_uuid not set on $1"
+
+	run_check_stdout $SUDO_HELPER "$TOP/btrfs" inspect-internal dump-super \
+		"$2" | grep -q METADATA_UUID
+	[ $? -eq 1 ] || _fail "metadata_uuid not set on $2"
+}
+
 check_multi_fsid_change() {
 	check_inprogress_flag "$1" "$2"
 	check_completed "$1" "$2"
 }
 
+check_multi_fsid_unchanged() {
+	check_inprogress_flag "$1" "$2"
+	check_flag_cleared "$1" "$2"
+}
+
 failure_recovery() {
 	local image1
 	local image2
@@ -227,3 +243,12 @@ failure_recovery "./disk4.raw.xz" "./disk3.raw.xz" check_completed
 failure_recovery "./disk5.raw.xz" "./disk6.raw.xz" check_multi_fsid_change
 reload_btrfs
 failure_recovery "./disk6.raw.xz" "./disk5.raw.xz" check_multi_fsid_change
+
+# disk7 contains an image which has undergone a successful fsid change once to 
+# a different value and once back to the original one, disk8 is part of the 
+# same filesystem but in this case it has missed the second transaction commit
+# during the process change. So disk 7 looks as if it never underwent fsid change
+# and disk 8 has FSID_CHANGING_FLAG and METADATA_UUID but is stale. 
+failure_recovery "./disk7.raw.xz" "./disk8.raw.xz" check_multi_fsid_unchanged
+reload_btrfs
+failure_recovery "./disk8.raw.xz" "./disk7.raw.xz" check_multi_fsid_unchanged
Signature · 1 line
2.7.4
Applied
#1 lore raw
Quoted 5 lines · Nikolay Borisov

This adds cooked images to exercise the case when a filesystem with metadata uuid incompat flag is switched back to having fsid/metadata uuid being equal.

Applied, thanks.