Skip to contentSkip to conversation

btrfs: update golden output of RST test cases

PATCH Applied Johannes Thumshirn 4 participants 4 messages Jul 1, 2024 – Jul 12, 2024 Btrfs file system

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 btrfs: update golden output of RST test cases

From: Johannes Thumshirn <[email protected]>

Starting with kernel patch "btrfs: remove raid-stripe-tree encoding field from stripe_extent" and btrfs-progs commit 7c549b5f7cc0 ("btrfs-progs: remove raid stripe encoding"), the on-disk format of the raid stripe tree got changed.

As the feature is still experimental and not to be used in production, it is OK to do a on-disk format change.

Update the golden output of the RAID stripe tree test cases after the on-disk format and print format changes.

---

Changes to v1:
- Mention the kernel and btrfs-progs changes mandating this change.

 tests/btrfs/304.out |  9 +++------
 tests/btrfs/305.out | 24 ++++++++----------------
 tests/btrfs/306.out | 18 ++++++------------
 tests/btrfs/307.out | 15 +++++----------
 tests/btrfs/308.out | 39 +++++++++++++--------------------------
 5 files changed, 35 insertions(+), 70 deletions(-)
tests/btrfs/304.out +3 -6
index 39f56f32274d..97ec27455b01 100644
@@ -12,8 +12,7 @@ checksum stored <CHECKSUM>
 checksum calced <CHECKSUM>
 fs uuid <UUID>
 chunk uuid <UUID>
-	item 0 key (XXXXXX RAID_STRIPE 4096) itemoff XXXXX itemsize 24
-			encoding: RAID0
+	item 0 key (XXXXXX RAID_STRIPE 4096) itemoff XXXXX itemsize 16
 			stripe 0 devid 1 physical XXXXXXXXX
 total bytes XXXXXXXX
 bytes used XXXXXX
@@ -30,8 +29,7 @@ checksum stored <CHECKSUM>
 checksum calced <CHECKSUM>
 fs uuid <UUID>
 chunk uuid <UUID>
-	item 0 key (XXXXXX RAID_STRIPE 4096) itemoff XXXXX itemsize 40
-			encoding: RAID1
+	item 0 key (XXXXXX RAID_STRIPE 4096) itemoff XXXXX itemsize 32
 			stripe 0 devid 1 physical XXXXXXXXX
 			stripe 1 devid 2 physical XXXXXXXXX
 total bytes XXXXXXXX
@@ -49,8 +47,7 @@ checksum stored <CHECKSUM>
 checksum calced <CHECKSUM>
 fs uuid <UUID>
 chunk uuid <UUID>
-	item 0 key (XXXXXX RAID_STRIPE 4096) itemoff XXXXX itemsize 40
-			encoding: RAID10
+	item 0 key (XXXXXX RAID_STRIPE 4096) itemoff XXXXX itemsize 32
 			stripe 0 devid 1 physical XXXXXXXXX
 			stripe 1 devid 2 physical XXXXXXXXX
 total bytes XXXXXXXX
tests/btrfs/305.out +8 -16
index 7090626c3036..02642c904b1e 100644
@@ -14,14 +14,11 @@ checksum stored <CHECKSUM>
 checksum calced <CHECKSUM>
 fs uuid <UUID>
 chunk uuid <UUID>
-	item 0 key (XXXXXX RAID_STRIPE 61440) itemoff XXXXX itemsize 24
-			encoding: RAID0
+	item 0 key (XXXXXX RAID_STRIPE 61440) itemoff XXXXX itemsize 16
 			stripe 0 devid 1 physical XXXXXXXXX
-	item 1 key (XXXXXX RAID_STRIPE 4096) itemoff XXXXX itemsize 24
-			encoding: RAID0
+	item 1 key (XXXXXX RAID_STRIPE 4096) itemoff XXXXX itemsize 16
 			stripe 0 devid 1 physical XXXXXXXXX
-	item 2 key (XXXXXX RAID_STRIPE 4096) itemoff XXXXX itemsize 24
-			encoding: RAID0
+	item 2 key (XXXXXX RAID_STRIPE 4096) itemoff XXXXX itemsize 16
 			stripe 0 devid 2 physical XXXXXXXXX
 total bytes XXXXXXXX
 bytes used XXXXXX
@@ -40,12 +37,10 @@ checksum stored <CHECKSUM>
 checksum calced <CHECKSUM>
 fs uuid <UUID>
 chunk uuid <UUID>
-	item 0 key (XXXXXX RAID_STRIPE 61440) itemoff XXXXX itemsize 40
-			encoding: RAID1
+	item 0 key (XXXXXX RAID_STRIPE 61440) itemoff XXXXX itemsize 32
 			stripe 0 devid 1 physical XXXXXXXXX
 			stripe 1 devid 2 physical XXXXXXXXX
-	item 1 key (XXXXXX RAID_STRIPE 8192) itemoff XXXXX itemsize 40
-			encoding: RAID1
+	item 1 key (XXXXXX RAID_STRIPE 8192) itemoff XXXXX itemsize 32
 			stripe 0 devid 1 physical XXXXXXXXX
 			stripe 1 devid 2 physical XXXXXXXXX
 total bytes XXXXXXXX
@@ -65,16 +60,13 @@ checksum stored <CHECKSUM>
 checksum calced <CHECKSUM>
 fs uuid <UUID>
 chunk uuid <UUID>
-	item 0 key (XXXXXX RAID_STRIPE 61440) itemoff XXXXX itemsize 40
-			encoding: RAID10
+	item 0 key (XXXXXX RAID_STRIPE 61440) itemoff XXXXX itemsize 32
 			stripe 0 devid 1 physical XXXXXXXXX
 			stripe 1 devid 2 physical XXXXXXXXX
-	item 1 key (XXXXXX RAID_STRIPE 4096) itemoff XXXXX itemsize 40
-			encoding: RAID10
+	item 1 key (XXXXXX RAID_STRIPE 4096) itemoff XXXXX itemsize 32
 			stripe 0 devid 1 physical XXXXXXXXX
 			stripe 1 devid 2 physical XXXXXXXXX
-	item 2 key (XXXXXX RAID_STRIPE 4096) itemoff XXXXX itemsize 40
-			encoding: RAID10
+	item 2 key (XXXXXX RAID_STRIPE 4096) itemoff XXXXX itemsize 32
 			stripe 0 devid 3 physical XXXXXXXXX
 			stripe 1 devid 4 physical XXXXXXXXX
 total bytes XXXXXXXX
tests/btrfs/306.out +6 -12
index 25065674c77b..954567db7623 100644
@@ -14,11 +14,9 @@ checksum stored <CHECKSUM>
 checksum calced <CHECKSUM>
 fs uuid <UUID>
 chunk uuid <UUID>
-	item 0 key (XXXXXX RAID_STRIPE 65536) itemoff XXXXX itemsize 24
-			encoding: RAID0
+	item 0 key (XXXXXX RAID_STRIPE 65536) itemoff XXXXX itemsize 16
 			stripe 0 devid 1 physical XXXXXXXXX
-	item 1 key (XXXXXX RAID_STRIPE 4096) itemoff XXXXX itemsize 24
-			encoding: RAID0
+	item 1 key (XXXXXX RAID_STRIPE 4096) itemoff XXXXX itemsize 16
 			stripe 0 devid 2 physical XXXXXXXXX
 total bytes XXXXXXXX
 bytes used XXXXXX
@@ -37,12 +35,10 @@ checksum stored <CHECKSUM>
 checksum calced <CHECKSUM>
 fs uuid <UUID>
 chunk uuid <UUID>
-	item 0 key (XXXXXX RAID_STRIPE 65536) itemoff XXXXX itemsize 40
-			encoding: RAID1
+	item 0 key (XXXXXX RAID_STRIPE 65536) itemoff XXXXX itemsize 32
 			stripe 0 devid 1 physical XXXXXXXXX
 			stripe 1 devid 2 physical XXXXXXXXX
-	item 1 key (XXXXXX RAID_STRIPE 4096) itemoff XXXXX itemsize 40
-			encoding: RAID1
+	item 1 key (XXXXXX RAID_STRIPE 4096) itemoff XXXXX itemsize 32
 			stripe 0 devid 1 physical XXXXXXXXX
 			stripe 1 devid 2 physical XXXXXXXXX
 total bytes XXXXXXXX
@@ -62,12 +58,10 @@ checksum stored <CHECKSUM>
 checksum calced <CHECKSUM>
 fs uuid <UUID>
 chunk uuid <UUID>
-	item 0 key (XXXXXX RAID_STRIPE 65536) itemoff XXXXX itemsize 40
-			encoding: RAID10
+	item 0 key (XXXXXX RAID_STRIPE 65536) itemoff XXXXX itemsize 32
 			stripe 0 devid 1 physical XXXXXXXXX
 			stripe 1 devid 2 physical XXXXXXXXX
-	item 1 key (XXXXXX RAID_STRIPE 4096) itemoff XXXXX itemsize 40
-			encoding: RAID10
+	item 1 key (XXXXXX RAID_STRIPE 4096) itemoff XXXXX itemsize 32
 			stripe 0 devid 3 physical XXXXXXXXX
 			stripe 1 devid 4 physical XXXXXXXXX
 total bytes XXXXXXXX
tests/btrfs/307.out +5 -10
index 2815d17d7f03..e2f1d3d84a68 100644
@@ -12,11 +12,9 @@ checksum stored <CHECKSUM>
 checksum calced <CHECKSUM>
 fs uuid <UUID>
 chunk uuid <UUID>
-	item 0 key (XXXXXX RAID_STRIPE 65536) itemoff XXXXX itemsize 24
-			encoding: RAID0
+	item 0 key (XXXXXX RAID_STRIPE 65536) itemoff XXXXX itemsize 16
 			stripe 0 devid 1 physical XXXXXXXXX
-	item 1 key (XXXXXX RAID_STRIPE 65536) itemoff XXXXX itemsize 24
-			encoding: RAID0
+	item 1 key (XXXXXX RAID_STRIPE 65536) itemoff XXXXX itemsize 16
 			stripe 0 devid 2 physical XXXXXXXXX
 total bytes XXXXXXXX
 bytes used XXXXXX
@@ -33,8 +31,7 @@ checksum stored <CHECKSUM>
 checksum calced <CHECKSUM>
 fs uuid <UUID>
 chunk uuid <UUID>
-	item 0 key (XXXXXX RAID_STRIPE 131072) itemoff XXXXX itemsize 40
-			encoding: RAID1
+	item 0 key (XXXXXX RAID_STRIPE 131072) itemoff XXXXX itemsize 32
 			stripe 0 devid 1 physical XXXXXXXXX
 			stripe 1 devid 2 physical XXXXXXXXX
 total bytes XXXXXXXX
@@ -52,12 +49,10 @@ checksum stored <CHECKSUM>
 checksum calced <CHECKSUM>
 fs uuid <UUID>
 chunk uuid <UUID>
-	item 0 key (XXXXXX RAID_STRIPE 65536) itemoff XXXXX itemsize 40
-			encoding: RAID10
+	item 0 key (XXXXXX RAID_STRIPE 65536) itemoff XXXXX itemsize 32
 			stripe 0 devid 1 physical XXXXXXXXX
 			stripe 1 devid 2 physical XXXXXXXXX
-	item 1 key (XXXXXX RAID_STRIPE 65536) itemoff XXXXX itemsize 40
-			encoding: RAID10
+	item 1 key (XXXXXX RAID_STRIPE 65536) itemoff XXXXX itemsize 32
 			stripe 0 devid 3 physical XXXXXXXXX
 			stripe 1 devid 4 physical XXXXXXXXX
 total bytes XXXXXXXX
tests/btrfs/308.out +13 -26
index 23b31dd32959..75e010d54252 100644
@@ -16,20 +16,15 @@ checksum stored <CHECKSUM>
 checksum calced <CHECKSUM>
 fs uuid <UUID>
 chunk uuid <UUID>
-	item 0 key (XXXXXX RAID_STRIPE 32768) itemoff XXXXX itemsize 24
-			encoding: RAID0
+	item 0 key (XXXXXX RAID_STRIPE 32768) itemoff XXXXX itemsize 16
 			stripe 0 devid 1 physical XXXXXXXXX
-	item 1 key (XXXXXX RAID_STRIPE 32768) itemoff XXXXX itemsize 24
-			encoding: RAID0
+	item 1 key (XXXXXX RAID_STRIPE 32768) itemoff XXXXX itemsize 16
 			stripe 0 devid 1 physical XXXXXXXXX
-	item 2 key (XXXXXX RAID_STRIPE 65536) itemoff XXXXX itemsize 24
-			encoding: RAID0
+	item 2 key (XXXXXX RAID_STRIPE 65536) itemoff XXXXX itemsize 16
 			stripe 0 devid 2 physical XXXXXXXXX
-	item 3 key (XXXXXX RAID_STRIPE 32768) itemoff XXXXX itemsize 24
-			encoding: RAID0
+	item 3 key (XXXXXX RAID_STRIPE 32768) itemoff XXXXX itemsize 16
 			stripe 0 devid 1 physical XXXXXXXXX
-	item 4 key (XXXXXX RAID_STRIPE 8192) itemoff XXXXX itemsize 24
-			encoding: RAID0
+	item 4 key (XXXXXX RAID_STRIPE 8192) itemoff XXXXX itemsize 16
 			stripe 0 devid 1 physical XXXXXXXXX
 total bytes XXXXXXXX
 bytes used XXXXXX
@@ -50,16 +45,13 @@ checksum stored <CHECKSUM>
 checksum calced <CHECKSUM>
 fs uuid <UUID>
 chunk uuid <UUID>
-	item 0 key (XXXXXX RAID_STRIPE 32768) itemoff XXXXX itemsize 40
-			encoding: RAID1
+	item 0 key (XXXXXX RAID_STRIPE 32768) itemoff XXXXX itemsize 32
 			stripe 0 devid 1 physical XXXXXXXXX
 			stripe 1 devid 2 physical XXXXXXXXX
-	item 1 key (XXXXXX RAID_STRIPE 131072) itemoff XXXXX itemsize 40
-			encoding: RAID1
+	item 1 key (XXXXXX RAID_STRIPE 131072) itemoff XXXXX itemsize 32
 			stripe 0 devid 1 physical XXXXXXXXX
 			stripe 1 devid 2 physical XXXXXXXXX
-	item 2 key (XXXXXX RAID_STRIPE 8192) itemoff XXXXX itemsize 40
-			encoding: RAID1
+	item 2 key (XXXXXX RAID_STRIPE 8192) itemoff XXXXX itemsize 32
 			stripe 0 devid 1 physical XXXXXXXXX
 			stripe 1 devid 2 physical XXXXXXXXX
 total bytes XXXXXXXX
@@ -81,24 +73,19 @@ checksum stored <CHECKSUM>
 checksum calced <CHECKSUM>
 fs uuid <UUID>
 chunk uuid <UUID>
-	item 0 key (XXXXXX RAID_STRIPE 32768) itemoff XXXXX itemsize 40
-			encoding: RAID10
+	item 0 key (XXXXXX RAID_STRIPE 32768) itemoff XXXXX itemsize 32
 			stripe 0 devid 1 physical XXXXXXXXX
 			stripe 1 devid 2 physical XXXXXXXXX
-	item 1 key (XXXXXX RAID_STRIPE 32768) itemoff XXXXX itemsize 40
-			encoding: RAID10
+	item 1 key (XXXXXX RAID_STRIPE 32768) itemoff XXXXX itemsize 32
 			stripe 0 devid 1 physical XXXXXXXXX
 			stripe 1 devid 2 physical XXXXXXXXX
-	item 2 key (XXXXXX RAID_STRIPE 65536) itemoff XXXXX itemsize 40
-			encoding: RAID10
+	item 2 key (XXXXXX RAID_STRIPE 65536) itemoff XXXXX itemsize 32
 			stripe 0 devid 3 physical XXXXXXXXX
 			stripe 1 devid 4 physical XXXXXXXXX
-	item 3 key (XXXXXX RAID_STRIPE 32768) itemoff XXXXX itemsize 40
-			encoding: RAID10
+	item 3 key (XXXXXX RAID_STRIPE 32768) itemoff XXXXX itemsize 32
 			stripe 0 devid 1 physical XXXXXXXXX
 			stripe 1 devid 2 physical XXXXXXXXX
-	item 4 key (XXXXXX RAID_STRIPE 8192) itemoff XXXXX itemsize 40
-			encoding: RAID10
+	item 4 key (XXXXXX RAID_STRIPE 8192) itemoff XXXXX itemsize 32
 			stripe 0 devid 1 physical XXXXXXXXX
 			stripe 1 devid 2 physical XXXXXXXXX
 total bytes XXXXXXXX
Signature · 1 line
2.43.0
Reviewed-by on v2 1/1
#1 lore raw
Quoted 8 lines · Johannes Thumshirn

From: Johannes Thumshirn <[email protected]>

Starting with kernel patch "btrfs: remove raid-stripe-tree encoding field from stripe_extent" and btrfs-progs commit 7c549b5f7cc0 ("btrfs-progs: remove raid stripe encoding"), the on-disk format of the raid stripe tree got changed.

Quoted 7 lines

As the feature is still experimental and not to be used in production, it is OK to do a on-disk format change.

Update the golden output of the RAID stripe tree test cases after the on-disk format and print format changes.

Thanks!

Quoted 279 lines

---

Changes to v1:
- Mention the kernel and btrfs-progs changes mandating this change.

 tests/btrfs/304.out |  9 +++------
 tests/btrfs/305.out | 24 ++++++++----------------
 tests/btrfs/306.out | 18 ++++++------------
 tests/btrfs/307.out | 15 +++++----------
 tests/btrfs/308.out | 39 +++++++++++++--------------------------
 5 files changed, 35 insertions(+), 70 deletions(-)
tests/btrfs/304.out +3 -6
index 39f56f32274d..97ec27455b01 100644
@@ -12,8 +12,7 @@ checksum stored <CHECKSUM>
 checksum calced <CHECKSUM>
 fs uuid <UUID>
 chunk uuid <UUID>
-       item 0 key (XXXXXX RAID_STRIPE 4096) itemoff XXXXX itemsize 24
-                       encoding: RAID0
+       item 0 key (XXXXXX RAID_STRIPE 4096) itemoff XXXXX itemsize 16
                        stripe 0 devid 1 physical XXXXXXXXX
 total bytes XXXXXXXX
 bytes used XXXXXX
@@ -30,8 +29,7 @@ checksum stored <CHECKSUM>
 checksum calced <CHECKSUM>
 fs uuid <UUID>
 chunk uuid <UUID>
-       item 0 key (XXXXXX RAID_STRIPE 4096) itemoff XXXXX itemsize 40
-                       encoding: RAID1
+       item 0 key (XXXXXX RAID_STRIPE 4096) itemoff XXXXX itemsize 32
                        stripe 0 devid 1 physical XXXXXXXXX
                        stripe 1 devid 2 physical XXXXXXXXX
 total bytes XXXXXXXX
@@ -49,8 +47,7 @@ checksum stored <CHECKSUM>
 checksum calced <CHECKSUM>
 fs uuid <UUID>
 chunk uuid <UUID>
-       item 0 key (XXXXXX RAID_STRIPE 4096) itemoff XXXXX itemsize 40
-                       encoding: RAID10
+       item 0 key (XXXXXX RAID_STRIPE 4096) itemoff XXXXX itemsize 32
                        stripe 0 devid 1 physical XXXXXXXXX
                        stripe 1 devid 2 physical XXXXXXXXX
 total bytes XXXXXXXX
tests/btrfs/305.out +8 -16
index 7090626c3036..02642c904b1e 100644
@@ -14,14 +14,11 @@ checksum stored <CHECKSUM>
 checksum calced <CHECKSUM>
 fs uuid <UUID>
 chunk uuid <UUID>
-       item 0 key (XXXXXX RAID_STRIPE 61440) itemoff XXXXX itemsize 24
-                       encoding: RAID0
+       item 0 key (XXXXXX RAID_STRIPE 61440) itemoff XXXXX itemsize 16
                        stripe 0 devid 1 physical XXXXXXXXX
-       item 1 key (XXXXXX RAID_STRIPE 4096) itemoff XXXXX itemsize 24
-                       encoding: RAID0
+       item 1 key (XXXXXX RAID_STRIPE 4096) itemoff XXXXX itemsize 16
                        stripe 0 devid 1 physical XXXXXXXXX
-       item 2 key (XXXXXX RAID_STRIPE 4096) itemoff XXXXX itemsize 24
-                       encoding: RAID0
+       item 2 key (XXXXXX RAID_STRIPE 4096) itemoff XXXXX itemsize 16
                        stripe 0 devid 2 physical XXXXXXXXX
 total bytes XXXXXXXX
 bytes used XXXXXX
@@ -40,12 +37,10 @@ checksum stored <CHECKSUM>
 checksum calced <CHECKSUM>
 fs uuid <UUID>
 chunk uuid <UUID>
-       item 0 key (XXXXXX RAID_STRIPE 61440) itemoff XXXXX itemsize 40
-                       encoding: RAID1
+       item 0 key (XXXXXX RAID_STRIPE 61440) itemoff XXXXX itemsize 32
                        stripe 0 devid 1 physical XXXXXXXXX
                        stripe 1 devid 2 physical XXXXXXXXX
-       item 1 key (XXXXXX RAID_STRIPE 8192) itemoff XXXXX itemsize 40
-                       encoding: RAID1
+       item 1 key (XXXXXX RAID_STRIPE 8192) itemoff XXXXX itemsize 32
                        stripe 0 devid 1 physical XXXXXXXXX
                        stripe 1 devid 2 physical XXXXXXXXX
 total bytes XXXXXXXX
@@ -65,16 +60,13 @@ checksum stored <CHECKSUM>
 checksum calced <CHECKSUM>
 fs uuid <UUID>
 chunk uuid <UUID>
-       item 0 key (XXXXXX RAID_STRIPE 61440) itemoff XXXXX itemsize 40
-                       encoding: RAID10
+       item 0 key (XXXXXX RAID_STRIPE 61440) itemoff XXXXX itemsize 32
                        stripe 0 devid 1 physical XXXXXXXXX
                        stripe 1 devid 2 physical XXXXXXXXX
-       item 1 key (XXXXXX RAID_STRIPE 4096) itemoff XXXXX itemsize 40
-                       encoding: RAID10
+       item 1 key (XXXXXX RAID_STRIPE 4096) itemoff XXXXX itemsize 32
                        stripe 0 devid 1 physical XXXXXXXXX
                        stripe 1 devid 2 physical XXXXXXXXX
-       item 2 key (XXXXXX RAID_STRIPE 4096) itemoff XXXXX itemsize 40
-                       encoding: RAID10
+       item 2 key (XXXXXX RAID_STRIPE 4096) itemoff XXXXX itemsize 32
                        stripe 0 devid 3 physical XXXXXXXXX
                        stripe 1 devid 4 physical XXXXXXXXX
 total bytes XXXXXXXX
tests/btrfs/306.out +6 -12
index 25065674c77b..954567db7623 100644
@@ -14,11 +14,9 @@ checksum stored <CHECKSUM>
 checksum calced <CHECKSUM>
 fs uuid <UUID>
 chunk uuid <UUID>
-       item 0 key (XXXXXX RAID_STRIPE 65536) itemoff XXXXX itemsize 24
-                       encoding: RAID0
+       item 0 key (XXXXXX RAID_STRIPE 65536) itemoff XXXXX itemsize 16
                        stripe 0 devid 1 physical XXXXXXXXX
-       item 1 key (XXXXXX RAID_STRIPE 4096) itemoff XXXXX itemsize 24
-                       encoding: RAID0
+       item 1 key (XXXXXX RAID_STRIPE 4096) itemoff XXXXX itemsize 16
                        stripe 0 devid 2 physical XXXXXXXXX
 total bytes XXXXXXXX
 bytes used XXXXXX
@@ -37,12 +35,10 @@ checksum stored <CHECKSUM>
 checksum calced <CHECKSUM>
 fs uuid <UUID>
 chunk uuid <UUID>
-       item 0 key (XXXXXX RAID_STRIPE 65536) itemoff XXXXX itemsize 40
-                       encoding: RAID1
+       item 0 key (XXXXXX RAID_STRIPE 65536) itemoff XXXXX itemsize 32
                        stripe 0 devid 1 physical XXXXXXXXX
                        stripe 1 devid 2 physical XXXXXXXXX
-       item 1 key (XXXXXX RAID_STRIPE 4096) itemoff XXXXX itemsize 40
-                       encoding: RAID1
+       item 1 key (XXXXXX RAID_STRIPE 4096) itemoff XXXXX itemsize 32
                        stripe 0 devid 1 physical XXXXXXXXX
                        stripe 1 devid 2 physical XXXXXXXXX
 total bytes XXXXXXXX
@@ -62,12 +58,10 @@ checksum stored <CHECKSUM>
 checksum calced <CHECKSUM>
 fs uuid <UUID>
 chunk uuid <UUID>
-       item 0 key (XXXXXX RAID_STRIPE 65536) itemoff XXXXX itemsize 40
-                       encoding: RAID10
+       item 0 key (XXXXXX RAID_STRIPE 65536) itemoff XXXXX itemsize 32
                        stripe 0 devid 1 physical XXXXXXXXX
                        stripe 1 devid 2 physical XXXXXXXXX
-       item 1 key (XXXXXX RAID_STRIPE 4096) itemoff XXXXX itemsize 40
-                       encoding: RAID10
+       item 1 key (XXXXXX RAID_STRIPE 4096) itemoff XXXXX itemsize 32
                        stripe 0 devid 3 physical XXXXXXXXX
                        stripe 1 devid 4 physical XXXXXXXXX
 total bytes XXXXXXXX
tests/btrfs/307.out +5 -10
index 2815d17d7f03..e2f1d3d84a68 100644
@@ -12,11 +12,9 @@ checksum stored <CHECKSUM>
 checksum calced <CHECKSUM>
 fs uuid <UUID>
 chunk uuid <UUID>
-       item 0 key (XXXXXX RAID_STRIPE 65536) itemoff XXXXX itemsize 24
-                       encoding: RAID0
+       item 0 key (XXXXXX RAID_STRIPE 65536) itemoff XXXXX itemsize 16
                        stripe 0 devid 1 physical XXXXXXXXX
-       item 1 key (XXXXXX RAID_STRIPE 65536) itemoff XXXXX itemsize 24
-                       encoding: RAID0
+       item 1 key (XXXXXX RAID_STRIPE 65536) itemoff XXXXX itemsize 16
                        stripe 0 devid 2 physical XXXXXXXXX
 total bytes XXXXXXXX
 bytes used XXXXXX
@@ -33,8 +31,7 @@ checksum stored <CHECKSUM>
 checksum calced <CHECKSUM>
 fs uuid <UUID>
 chunk uuid <UUID>
-       item 0 key (XXXXXX RAID_STRIPE 131072) itemoff XXXXX itemsize 40
-                       encoding: RAID1
+       item 0 key (XXXXXX RAID_STRIPE 131072) itemoff XXXXX itemsize 32
                        stripe 0 devid 1 physical XXXXXXXXX
                        stripe 1 devid 2 physical XXXXXXXXX
 total bytes XXXXXXXX
@@ -52,12 +49,10 @@ checksum stored <CHECKSUM>
 checksum calced <CHECKSUM>
 fs uuid <UUID>
 chunk uuid <UUID>
-       item 0 key (XXXXXX RAID_STRIPE 65536) itemoff XXXXX itemsize 40
-                       encoding: RAID10
+       item 0 key (XXXXXX RAID_STRIPE 65536) itemoff XXXXX itemsize 32
                        stripe 0 devid 1 physical XXXXXXXXX
                        stripe 1 devid 2 physical XXXXXXXXX
-       item 1 key (XXXXXX RAID_STRIPE 65536) itemoff XXXXX itemsize 40
-                       encoding: RAID10
+       item 1 key (XXXXXX RAID_STRIPE 65536) itemoff XXXXX itemsize 32
                        stripe 0 devid 3 physical XXXXXXXXX
                        stripe 1 devid 4 physical XXXXXXXXX
 total bytes XXXXXXXX
tests/btrfs/308.out +13 -27
index 23b31dd32959..75e010d54252 100644
@@ -16,20 +16,15 @@ checksum stored <CHECKSUM>
 checksum calced <CHECKSUM>
 fs uuid <UUID>
 chunk uuid <UUID>
-       item 0 key (XXXXXX RAID_STRIPE 32768) itemoff XXXXX itemsize 24
-                       encoding: RAID0
+       item 0 key (XXXXXX RAID_STRIPE 32768) itemoff XXXXX itemsize 16
                        stripe 0 devid 1 physical XXXXXXXXX
-       item 1 key (XXXXXX RAID_STRIPE 32768) itemoff XXXXX itemsize 24
-                       encoding: RAID0
+       item 1 key (XXXXXX RAID_STRIPE 32768) itemoff XXXXX itemsize 16
                        stripe 0 devid 1 physical XXXXXXXXX
-       item 2 key (XXXXXX RAID_STRIPE 65536) itemoff XXXXX itemsize 24
-                       encoding: RAID0
+       item 2 key (XXXXXX RAID_STRIPE 65536) itemoff XXXXX itemsize 16
                        stripe 0 devid 2 physical XXXXXXXXX
-       item 3 key (XXXXXX RAID_STRIPE 32768) itemoff XXXXX itemsize 24
-                       encoding: RAID0
+       item 3 key (XXXXXX RAID_STRIPE 32768) itemoff XXXXX itemsize 16
                        stripe 0 devid 1 physical XXXXXXXXX
-       item 4 key (XXXXXX RAID_STRIPE 8192) itemoff XXXXX itemsize 24
-                       encoding: RAID0
+       item 4 key (XXXXXX RAID_STRIPE 8192) itemoff XXXXX itemsize 16
                        stripe 0 devid 1 physical XXXXXXXXX
 total bytes XXXXXXXX
 bytes used XXXXXX
@@ -50,16 +45,13 @@ checksum stored <CHECKSUM>
 checksum calced <CHECKSUM>
 fs uuid <UUID>
 chunk uuid <UUID>
-       item 0 key (XXXXXX RAID_STRIPE 32768) itemoff XXXXX itemsize 40
-                       encoding: RAID1
+       item 0 key (XXXXXX RAID_STRIPE 32768) itemoff XXXXX itemsize 32
                        stripe 0 devid 1 physical XXXXXXXXX
                        stripe 1 devid 2 physical XXXXXXXXX
-       item 1 key (XXXXXX RAID_STRIPE 131072) itemoff XXXXX itemsize 40
-                       encoding: RAID1
+       item 1 key (XXXXXX RAID_STRIPE 131072) itemoff XXXXX itemsize 32
                        stripe 0 devid 1 physical XXXXXXXXX
                        stripe 1 devid 2 physical XXXXXXXXX
-       item 2 key (XXXXXX RAID_STRIPE 8192) itemoff XXXXX itemsize 40
-                       encoding: RAID1
+       item 2 key (XXXXXX RAID_STRIPE 8192) itemoff XXXXX itemsize 32
                        stripe 0 devid 1 physical XXXXXXXXX
                        stripe 1 devid 2 physical XXXXXXXXX
 total bytes XXXXXXXX
@@ -81,24 +73,19 @@ checksum stored <CHECKSUM>
 checksum calced <CHECKSUM>
 fs uuid <UUID>
 chunk uuid <UUID>
-       item 0 key (XXXXXX RAID_STRIPE 32768) itemoff XXXXX itemsize 40
-                       encoding: RAID10
+       item 0 key (XXXXXX RAID_STRIPE 32768) itemoff XXXXX itemsize 32
                        stripe 0 devid 1 physical XXXXXXXXX
                        stripe 1 devid 2 physical XXXXXXXXX
-       item 1 key (XXXXXX RAID_STRIPE 32768) itemoff XXXXX itemsize 40
-                       encoding: RAID10
+       item 1 key (XXXXXX RAID_STRIPE 32768) itemoff XXXXX itemsize 32
                        stripe 0 devid 1 physical XXXXXXXXX
                        stripe 1 devid 2 physical XXXXXXXXX
-       item 2 key (XXXXXX RAID_STRIPE 65536) itemoff XXXXX itemsize 40
-                       encoding: RAID10
+       item 2 key (XXXXXX RAID_STRIPE 65536) itemoff XXXXX itemsize 32
                        stripe 0 devid 3 physical XXXXXXXXX
                        stripe 1 devid 4 physical XXXXXXXXX
-       item 3 key (XXXXXX RAID_STRIPE 32768) itemoff XXXXX itemsize 40
-                       encoding: RAID10
+       item 3 key (XXXXXX RAID_STRIPE 32768) itemoff XXXXX itemsize 32
                        stripe 0 devid 1 physical XXXXXXXXX
                        stripe 1 devid 2 physical XXXXXXXXX
-       item 4 key (XXXXXX RAID_STRIPE 8192) itemoff XXXXX itemsize 40
-                       encoding: RAID10
+       item 4 key (XXXXXX RAID_STRIPE 8192) itemoff XXXXX itemsize 32
                        stripe 0 devid 1 physical XXXXXXXXX
                        stripe 1 devid 2 physical XXXXXXXXX
 total bytes XXXXXXXX
--

2.43.0

Reviewed-by on v2 1/1
#2 lore raw
In reply to Johannes Thumshirn
Quoted 7 lines · Johannes Thumshirn

From: Johannes Thumshirn <[email protected]>

Starting with kernel patch "btrfs: remove raid-stripe-tree encoding field from stripe_extent" and btrfs-progs commit 7c549b5f7cc0 ("btrfs-progs: remove raid stripe encoding"), the on-disk format of the raid stripe tree got changed.

Quoted 7 lines

As the feature is still experimental and not to be used in production, it is OK to do a on-disk format change.

Update the golden output of the RAID stripe tree test cases after the on-disk format and print format changes.

Thanks,
Qu

Quoted 275 lines

---

Changes to v1:
- Mention the kernel and btrfs-progs changes mandating this change.

  tests/btrfs/304.out |  9 +++------
  tests/btrfs/305.out | 24 ++++++++----------------
  tests/btrfs/306.out | 18 ++++++------------
  tests/btrfs/307.out | 15 +++++----------
  tests/btrfs/308.out | 39 +++++++++++++--------------------------
  5 files changed, 35 insertions(+), 70 deletions(-)
tests/btrfs/304.out +3 -6
index 39f56f32274d..97ec27455b01 100644
@@ -12,8 +12,7 @@ checksum stored <CHECKSUM>
  checksum calced <CHECKSUM>
  fs uuid <UUID>
  chunk uuid <UUID>
-	item 0 key (XXXXXX RAID_STRIPE 4096) itemoff XXXXX itemsize 24
-			encoding: RAID0
+	item 0 key (XXXXXX RAID_STRIPE 4096) itemoff XXXXX itemsize 16
  			stripe 0 devid 1 physical XXXXXXXXX
  total bytes XXXXXXXX
  bytes used XXXXXX
@@ -30,8 +29,7 @@ checksum stored <CHECKSUM>
  checksum calced <CHECKSUM>
  fs uuid <UUID>
  chunk uuid <UUID>
-	item 0 key (XXXXXX RAID_STRIPE 4096) itemoff XXXXX itemsize 40
-			encoding: RAID1
+	item 0 key (XXXXXX RAID_STRIPE 4096) itemoff XXXXX itemsize 32
  			stripe 0 devid 1 physical XXXXXXXXX
  			stripe 1 devid 2 physical XXXXXXXXX
  total bytes XXXXXXXX
@@ -49,8 +47,7 @@ checksum stored <CHECKSUM>
  checksum calced <CHECKSUM>
  fs uuid <UUID>
  chunk uuid <UUID>
-	item 0 key (XXXXXX RAID_STRIPE 4096) itemoff XXXXX itemsize 40
-			encoding: RAID10
+	item 0 key (XXXXXX RAID_STRIPE 4096) itemoff XXXXX itemsize 32
  			stripe 0 devid 1 physical XXXXXXXXX
  			stripe 1 devid 2 physical XXXXXXXXX
  total bytes XXXXXXXX
tests/btrfs/305.out +8 -16
index 7090626c3036..02642c904b1e 100644
@@ -14,14 +14,11 @@ checksum stored <CHECKSUM>
  checksum calced <CHECKSUM>
  fs uuid <UUID>
  chunk uuid <UUID>
-	item 0 key (XXXXXX RAID_STRIPE 61440) itemoff XXXXX itemsize 24
-			encoding: RAID0
+	item 0 key (XXXXXX RAID_STRIPE 61440) itemoff XXXXX itemsize 16
  			stripe 0 devid 1 physical XXXXXXXXX
-	item 1 key (XXXXXX RAID_STRIPE 4096) itemoff XXXXX itemsize 24
-			encoding: RAID0
+	item 1 key (XXXXXX RAID_STRIPE 4096) itemoff XXXXX itemsize 16
  			stripe 0 devid 1 physical XXXXXXXXX
-	item 2 key (XXXXXX RAID_STRIPE 4096) itemoff XXXXX itemsize 24
-			encoding: RAID0
+	item 2 key (XXXXXX RAID_STRIPE 4096) itemoff XXXXX itemsize 16
  			stripe 0 devid 2 physical XXXXXXXXX
  total bytes XXXXXXXX
  bytes used XXXXXX
@@ -40,12 +37,10 @@ checksum stored <CHECKSUM>
  checksum calced <CHECKSUM>
  fs uuid <UUID>
  chunk uuid <UUID>
-	item 0 key (XXXXXX RAID_STRIPE 61440) itemoff XXXXX itemsize 40
-			encoding: RAID1
+	item 0 key (XXXXXX RAID_STRIPE 61440) itemoff XXXXX itemsize 32
  			stripe 0 devid 1 physical XXXXXXXXX
  			stripe 1 devid 2 physical XXXXXXXXX
-	item 1 key (XXXXXX RAID_STRIPE 8192) itemoff XXXXX itemsize 40
-			encoding: RAID1
+	item 1 key (XXXXXX RAID_STRIPE 8192) itemoff XXXXX itemsize 32
  			stripe 0 devid 1 physical XXXXXXXXX
  			stripe 1 devid 2 physical XXXXXXXXX
  total bytes XXXXXXXX
@@ -65,16 +60,13 @@ checksum stored <CHECKSUM>
  checksum calced <CHECKSUM>
  fs uuid <UUID>
  chunk uuid <UUID>
-	item 0 key (XXXXXX RAID_STRIPE 61440) itemoff XXXXX itemsize 40
-			encoding: RAID10
+	item 0 key (XXXXXX RAID_STRIPE 61440) itemoff XXXXX itemsize 32
  			stripe 0 devid 1 physical XXXXXXXXX
  			stripe 1 devid 2 physical XXXXXXXXX
-	item 1 key (XXXXXX RAID_STRIPE 4096) itemoff XXXXX itemsize 40
-			encoding: RAID10
+	item 1 key (XXXXXX RAID_STRIPE 4096) itemoff XXXXX itemsize 32
  			stripe 0 devid 1 physical XXXXXXXXX
  			stripe 1 devid 2 physical XXXXXXXXX
-	item 2 key (XXXXXX RAID_STRIPE 4096) itemoff XXXXX itemsize 40
-			encoding: RAID10
+	item 2 key (XXXXXX RAID_STRIPE 4096) itemoff XXXXX itemsize 32
  			stripe 0 devid 3 physical XXXXXXXXX
  			stripe 1 devid 4 physical XXXXXXXXX
  total bytes XXXXXXXX
tests/btrfs/306.out +6 -12
index 25065674c77b..954567db7623 100644
@@ -14,11 +14,9 @@ checksum stored <CHECKSUM>
  checksum calced <CHECKSUM>
  fs uuid <UUID>
  chunk uuid <UUID>
-	item 0 key (XXXXXX RAID_STRIPE 65536) itemoff XXXXX itemsize 24
-			encoding: RAID0
+	item 0 key (XXXXXX RAID_STRIPE 65536) itemoff XXXXX itemsize 16
  			stripe 0 devid 1 physical XXXXXXXXX
-	item 1 key (XXXXXX RAID_STRIPE 4096) itemoff XXXXX itemsize 24
-			encoding: RAID0
+	item 1 key (XXXXXX RAID_STRIPE 4096) itemoff XXXXX itemsize 16
  			stripe 0 devid 2 physical XXXXXXXXX
  total bytes XXXXXXXX
  bytes used XXXXXX
@@ -37,12 +35,10 @@ checksum stored <CHECKSUM>
  checksum calced <CHECKSUM>
  fs uuid <UUID>
  chunk uuid <UUID>
-	item 0 key (XXXXXX RAID_STRIPE 65536) itemoff XXXXX itemsize 40
-			encoding: RAID1
+	item 0 key (XXXXXX RAID_STRIPE 65536) itemoff XXXXX itemsize 32
  			stripe 0 devid 1 physical XXXXXXXXX
  			stripe 1 devid 2 physical XXXXXXXXX
-	item 1 key (XXXXXX RAID_STRIPE 4096) itemoff XXXXX itemsize 40
-			encoding: RAID1
+	item 1 key (XXXXXX RAID_STRIPE 4096) itemoff XXXXX itemsize 32
  			stripe 0 devid 1 physical XXXXXXXXX
  			stripe 1 devid 2 physical XXXXXXXXX
  total bytes XXXXXXXX
@@ -62,12 +58,10 @@ checksum stored <CHECKSUM>
  checksum calced <CHECKSUM>
  fs uuid <UUID>
  chunk uuid <UUID>
-	item 0 key (XXXXXX RAID_STRIPE 65536) itemoff XXXXX itemsize 40
-			encoding: RAID10
+	item 0 key (XXXXXX RAID_STRIPE 65536) itemoff XXXXX itemsize 32
  			stripe 0 devid 1 physical XXXXXXXXX
  			stripe 1 devid 2 physical XXXXXXXXX
-	item 1 key (XXXXXX RAID_STRIPE 4096) itemoff XXXXX itemsize 40
-			encoding: RAID10
+	item 1 key (XXXXXX RAID_STRIPE 4096) itemoff XXXXX itemsize 32
  			stripe 0 devid 3 physical XXXXXXXXX
  			stripe 1 devid 4 physical XXXXXXXXX
  total bytes XXXXXXXX
tests/btrfs/307.out +5 -10
index 2815d17d7f03..e2f1d3d84a68 100644
@@ -12,11 +12,9 @@ checksum stored <CHECKSUM>
  checksum calced <CHECKSUM>
  fs uuid <UUID>
  chunk uuid <UUID>
-	item 0 key (XXXXXX RAID_STRIPE 65536) itemoff XXXXX itemsize 24
-			encoding: RAID0
+	item 0 key (XXXXXX RAID_STRIPE 65536) itemoff XXXXX itemsize 16
  			stripe 0 devid 1 physical XXXXXXXXX
-	item 1 key (XXXXXX RAID_STRIPE 65536) itemoff XXXXX itemsize 24
-			encoding: RAID0
+	item 1 key (XXXXXX RAID_STRIPE 65536) itemoff XXXXX itemsize 16
  			stripe 0 devid 2 physical XXXXXXXXX
  total bytes XXXXXXXX
  bytes used XXXXXX
@@ -33,8 +31,7 @@ checksum stored <CHECKSUM>
  checksum calced <CHECKSUM>
  fs uuid <UUID>
  chunk uuid <UUID>
-	item 0 key (XXXXXX RAID_STRIPE 131072) itemoff XXXXX itemsize 40
-			encoding: RAID1
+	item 0 key (XXXXXX RAID_STRIPE 131072) itemoff XXXXX itemsize 32
  			stripe 0 devid 1 physical XXXXXXXXX
  			stripe 1 devid 2 physical XXXXXXXXX
  total bytes XXXXXXXX
@@ -52,12 +49,10 @@ checksum stored <CHECKSUM>
  checksum calced <CHECKSUM>
  fs uuid <UUID>
  chunk uuid <UUID>
-	item 0 key (XXXXXX RAID_STRIPE 65536) itemoff XXXXX itemsize 40
-			encoding: RAID10
+	item 0 key (XXXXXX RAID_STRIPE 65536) itemoff XXXXX itemsize 32
  			stripe 0 devid 1 physical XXXXXXXXX
  			stripe 1 devid 2 physical XXXXXXXXX
-	item 1 key (XXXXXX RAID_STRIPE 65536) itemoff XXXXX itemsize 40
-			encoding: RAID10
+	item 1 key (XXXXXX RAID_STRIPE 65536) itemoff XXXXX itemsize 32
  			stripe 0 devid 3 physical XXXXXXXXX
  			stripe 1 devid 4 physical XXXXXXXXX
  total bytes XXXXXXXX
tests/btrfs/308.out +13 -26
index 23b31dd32959..75e010d54252 100644
@@ -16,20 +16,15 @@ checksum stored <CHECKSUM>
  checksum calced <CHECKSUM>
  fs uuid <UUID>
  chunk uuid <UUID>
-	item 0 key (XXXXXX RAID_STRIPE 32768) itemoff XXXXX itemsize 24
-			encoding: RAID0
+	item 0 key (XXXXXX RAID_STRIPE 32768) itemoff XXXXX itemsize 16
  			stripe 0 devid 1 physical XXXXXXXXX
-	item 1 key (XXXXXX RAID_STRIPE 32768) itemoff XXXXX itemsize 24
-			encoding: RAID0
+	item 1 key (XXXXXX RAID_STRIPE 32768) itemoff XXXXX itemsize 16
  			stripe 0 devid 1 physical XXXXXXXXX
-	item 2 key (XXXXXX RAID_STRIPE 65536) itemoff XXXXX itemsize 24
-			encoding: RAID0
+	item 2 key (XXXXXX RAID_STRIPE 65536) itemoff XXXXX itemsize 16
  			stripe 0 devid 2 physical XXXXXXXXX
-	item 3 key (XXXXXX RAID_STRIPE 32768) itemoff XXXXX itemsize 24
-			encoding: RAID0
+	item 3 key (XXXXXX RAID_STRIPE 32768) itemoff XXXXX itemsize 16
  			stripe 0 devid 1 physical XXXXXXXXX
-	item 4 key (XXXXXX RAID_STRIPE 8192) itemoff XXXXX itemsize 24
-			encoding: RAID0
+	item 4 key (XXXXXX RAID_STRIPE 8192) itemoff XXXXX itemsize 16
  			stripe 0 devid 1 physical XXXXXXXXX
  total bytes XXXXXXXX
  bytes used XXXXXX
@@ -50,16 +45,13 @@ checksum stored <CHECKSUM>
  checksum calced <CHECKSUM>
  fs uuid <UUID>
  chunk uuid <UUID>
-	item 0 key (XXXXXX RAID_STRIPE 32768) itemoff XXXXX itemsize 40
-			encoding: RAID1
+	item 0 key (XXXXXX RAID_STRIPE 32768) itemoff XXXXX itemsize 32
  			stripe 0 devid 1 physical XXXXXXXXX
  			stripe 1 devid 2 physical XXXXXXXXX
-	item 1 key (XXXXXX RAID_STRIPE 131072) itemoff XXXXX itemsize 40
-			encoding: RAID1
+	item 1 key (XXXXXX RAID_STRIPE 131072) itemoff XXXXX itemsize 32
  			stripe 0 devid 1 physical XXXXXXXXX
  			stripe 1 devid 2 physical XXXXXXXXX
-	item 2 key (XXXXXX RAID_STRIPE 8192) itemoff XXXXX itemsize 40
-			encoding: RAID1
+	item 2 key (XXXXXX RAID_STRIPE 8192) itemoff XXXXX itemsize 32
  			stripe 0 devid 1 physical XXXXXXXXX
  			stripe 1 devid 2 physical XXXXXXXXX
  total bytes XXXXXXXX
@@ -81,24 +73,19 @@ checksum stored <CHECKSUM>
  checksum calced <CHECKSUM>
  fs uuid <UUID>
  chunk uuid <UUID>
-	item 0 key (XXXXXX RAID_STRIPE 32768) itemoff XXXXX itemsize 40
-			encoding: RAID10
+	item 0 key (XXXXXX RAID_STRIPE 32768) itemoff XXXXX itemsize 32
  			stripe 0 devid 1 physical XXXXXXXXX
  			stripe 1 devid 2 physical XXXXXXXXX
-	item 1 key (XXXXXX RAID_STRIPE 32768) itemoff XXXXX itemsize 40
-			encoding: RAID10
+	item 1 key (XXXXXX RAID_STRIPE 32768) itemoff XXXXX itemsize 32
  			stripe 0 devid 1 physical XXXXXXXXX
  			stripe 1 devid 2 physical XXXXXXXXX
-	item 2 key (XXXXXX RAID_STRIPE 65536) itemoff XXXXX itemsize 40
-			encoding: RAID10
+	item 2 key (XXXXXX RAID_STRIPE 65536) itemoff XXXXX itemsize 32
  			stripe 0 devid 3 physical XXXXXXXXX
  			stripe 1 devid 4 physical XXXXXXXXX
-	item 3 key (XXXXXX RAID_STRIPE 32768) itemoff XXXXX itemsize 40
-			encoding: RAID10
+	item 3 key (XXXXXX RAID_STRIPE 32768) itemoff XXXXX itemsize 32
  			stripe 0 devid 1 physical XXXXXXXXX
  			stripe 1 devid 2 physical XXXXXXXXX
-	item 4 key (XXXXXX RAID_STRIPE 8192) itemoff XXXXX itemsize 40
-			encoding: RAID10
+	item 4 key (XXXXXX RAID_STRIPE 8192) itemoff XXXXX itemsize 32
  			stripe 0 devid 1 physical XXXXXXXXX
  			stripe 1 devid 2 physical XXXXXXXXX
  total bytes XXXXXXXX
Reviewed-by on v2 1/1 Applied
#3 lore raw
In reply to Johannes Thumshirn
Quoted 10 lines · Johannes Thumshirn

From: Johannes Thumshirn <[email protected]>

Starting with kernel patch "btrfs: remove raid-stripe-tree encoding field from stripe_extent" and btrfs-progs commit 7c549b5f7cc0 ("btrfs-progs: remove raid stripe encoding"), the on-disk format of the raid stripe tree got changed.

As the feature is still experimental and not to be used in production, it is OK to do a on-disk format change.

Quoted 10 lines

Update the golden output of the RAID stripe tree test cases after the on-disk format and print format changes.

---

Changes to v1:
- Mention the kernel and btrfs-progs changes mandating this change.

Applied.

Thanks, Anand

Quoted 269 lines
  tests/btrfs/304.out |  9 +++------
  tests/btrfs/305.out | 24 ++++++++----------------
  tests/btrfs/306.out | 18 ++++++------------
  tests/btrfs/307.out | 15 +++++----------
  tests/btrfs/308.out | 39 +++++++++++++--------------------------
  5 files changed, 35 insertions(+), 70 deletions(-)
tests/btrfs/304.out +3 -6
index 39f56f32274d..97ec27455b01 100644
@@ -12,8 +12,7 @@ checksum stored <CHECKSUM>
  checksum calced <CHECKSUM>
  fs uuid <UUID>
  chunk uuid <UUID>
-	item 0 key (XXXXXX RAID_STRIPE 4096) itemoff XXXXX itemsize 24
-			encoding: RAID0
+	item 0 key (XXXXXX RAID_STRIPE 4096) itemoff XXXXX itemsize 16
  			stripe 0 devid 1 physical XXXXXXXXX
  total bytes XXXXXXXX
  bytes used XXXXXX
@@ -30,8 +29,7 @@ checksum stored <CHECKSUM>
  checksum calced <CHECKSUM>
  fs uuid <UUID>
  chunk uuid <UUID>
-	item 0 key (XXXXXX RAID_STRIPE 4096) itemoff XXXXX itemsize 40
-			encoding: RAID1
+	item 0 key (XXXXXX RAID_STRIPE 4096) itemoff XXXXX itemsize 32
  			stripe 0 devid 1 physical XXXXXXXXX
  			stripe 1 devid 2 physical XXXXXXXXX
  total bytes XXXXXXXX
@@ -49,8 +47,7 @@ checksum stored <CHECKSUM>
  checksum calced <CHECKSUM>
  fs uuid <UUID>
  chunk uuid <UUID>
-	item 0 key (XXXXXX RAID_STRIPE 4096) itemoff XXXXX itemsize 40
-			encoding: RAID10
+	item 0 key (XXXXXX RAID_STRIPE 4096) itemoff XXXXX itemsize 32
  			stripe 0 devid 1 physical XXXXXXXXX
  			stripe 1 devid 2 physical XXXXXXXXX
  total bytes XXXXXXXX
tests/btrfs/305.out +8 -16
index 7090626c3036..02642c904b1e 100644
@@ -14,14 +14,11 @@ checksum stored <CHECKSUM>
  checksum calced <CHECKSUM>
  fs uuid <UUID>
  chunk uuid <UUID>
-	item 0 key (XXXXXX RAID_STRIPE 61440) itemoff XXXXX itemsize 24
-			encoding: RAID0
+	item 0 key (XXXXXX RAID_STRIPE 61440) itemoff XXXXX itemsize 16
  			stripe 0 devid 1 physical XXXXXXXXX
-	item 1 key (XXXXXX RAID_STRIPE 4096) itemoff XXXXX itemsize 24
-			encoding: RAID0
+	item 1 key (XXXXXX RAID_STRIPE 4096) itemoff XXXXX itemsize 16
  			stripe 0 devid 1 physical XXXXXXXXX
-	item 2 key (XXXXXX RAID_STRIPE 4096) itemoff XXXXX itemsize 24
-			encoding: RAID0
+	item 2 key (XXXXXX RAID_STRIPE 4096) itemoff XXXXX itemsize 16
  			stripe 0 devid 2 physical XXXXXXXXX
  total bytes XXXXXXXX
  bytes used XXXXXX
@@ -40,12 +37,10 @@ checksum stored <CHECKSUM>
  checksum calced <CHECKSUM>
  fs uuid <UUID>
  chunk uuid <UUID>
-	item 0 key (XXXXXX RAID_STRIPE 61440) itemoff XXXXX itemsize 40
-			encoding: RAID1
+	item 0 key (XXXXXX RAID_STRIPE 61440) itemoff XXXXX itemsize 32
  			stripe 0 devid 1 physical XXXXXXXXX
  			stripe 1 devid 2 physical XXXXXXXXX
-	item 1 key (XXXXXX RAID_STRIPE 8192) itemoff XXXXX itemsize 40
-			encoding: RAID1
+	item 1 key (XXXXXX RAID_STRIPE 8192) itemoff XXXXX itemsize 32
  			stripe 0 devid 1 physical XXXXXXXXX
  			stripe 1 devid 2 physical XXXXXXXXX
  total bytes XXXXXXXX
@@ -65,16 +60,13 @@ checksum stored <CHECKSUM>
  checksum calced <CHECKSUM>
  fs uuid <UUID>
  chunk uuid <UUID>
-	item 0 key (XXXXXX RAID_STRIPE 61440) itemoff XXXXX itemsize 40
-			encoding: RAID10
+	item 0 key (XXXXXX RAID_STRIPE 61440) itemoff XXXXX itemsize 32
  			stripe 0 devid 1 physical XXXXXXXXX
  			stripe 1 devid 2 physical XXXXXXXXX
-	item 1 key (XXXXXX RAID_STRIPE 4096) itemoff XXXXX itemsize 40
-			encoding: RAID10
+	item 1 key (XXXXXX RAID_STRIPE 4096) itemoff XXXXX itemsize 32
  			stripe 0 devid 1 physical XXXXXXXXX
  			stripe 1 devid 2 physical XXXXXXXXX
-	item 2 key (XXXXXX RAID_STRIPE 4096) itemoff XXXXX itemsize 40
-			encoding: RAID10
+	item 2 key (XXXXXX RAID_STRIPE 4096) itemoff XXXXX itemsize 32
  			stripe 0 devid 3 physical XXXXXXXXX
  			stripe 1 devid 4 physical XXXXXXXXX
  total bytes XXXXXXXX
tests/btrfs/306.out +6 -12
index 25065674c77b..954567db7623 100644
@@ -14,11 +14,9 @@ checksum stored <CHECKSUM>
  checksum calced <CHECKSUM>
  fs uuid <UUID>
  chunk uuid <UUID>
-	item 0 key (XXXXXX RAID_STRIPE 65536) itemoff XXXXX itemsize 24
-			encoding: RAID0
+	item 0 key (XXXXXX RAID_STRIPE 65536) itemoff XXXXX itemsize 16
  			stripe 0 devid 1 physical XXXXXXXXX
-	item 1 key (XXXXXX RAID_STRIPE 4096) itemoff XXXXX itemsize 24
-			encoding: RAID0
+	item 1 key (XXXXXX RAID_STRIPE 4096) itemoff XXXXX itemsize 16
  			stripe 0 devid 2 physical XXXXXXXXX
  total bytes XXXXXXXX
  bytes used XXXXXX
@@ -37,12 +35,10 @@ checksum stored <CHECKSUM>
  checksum calced <CHECKSUM>
  fs uuid <UUID>
  chunk uuid <UUID>
-	item 0 key (XXXXXX RAID_STRIPE 65536) itemoff XXXXX itemsize 40
-			encoding: RAID1
+	item 0 key (XXXXXX RAID_STRIPE 65536) itemoff XXXXX itemsize 32
  			stripe 0 devid 1 physical XXXXXXXXX
  			stripe 1 devid 2 physical XXXXXXXXX
-	item 1 key (XXXXXX RAID_STRIPE 4096) itemoff XXXXX itemsize 40
-			encoding: RAID1
+	item 1 key (XXXXXX RAID_STRIPE 4096) itemoff XXXXX itemsize 32
  			stripe 0 devid 1 physical XXXXXXXXX
  			stripe 1 devid 2 physical XXXXXXXXX
  total bytes XXXXXXXX
@@ -62,12 +58,10 @@ checksum stored <CHECKSUM>
  checksum calced <CHECKSUM>
  fs uuid <UUID>
  chunk uuid <UUID>
-	item 0 key (XXXXXX RAID_STRIPE 65536) itemoff XXXXX itemsize 40
-			encoding: RAID10
+	item 0 key (XXXXXX RAID_STRIPE 65536) itemoff XXXXX itemsize 32
  			stripe 0 devid 1 physical XXXXXXXXX
  			stripe 1 devid 2 physical XXXXXXXXX
-	item 1 key (XXXXXX RAID_STRIPE 4096) itemoff XXXXX itemsize 40
-			encoding: RAID10
+	item 1 key (XXXXXX RAID_STRIPE 4096) itemoff XXXXX itemsize 32
  			stripe 0 devid 3 physical XXXXXXXXX
  			stripe 1 devid 4 physical XXXXXXXXX
  total bytes XXXXXXXX
tests/btrfs/307.out +5 -10
index 2815d17d7f03..e2f1d3d84a68 100644
@@ -12,11 +12,9 @@ checksum stored <CHECKSUM>
  checksum calced <CHECKSUM>
  fs uuid <UUID>
  chunk uuid <UUID>
-	item 0 key (XXXXXX RAID_STRIPE 65536) itemoff XXXXX itemsize 24
-			encoding: RAID0
+	item 0 key (XXXXXX RAID_STRIPE 65536) itemoff XXXXX itemsize 16
  			stripe 0 devid 1 physical XXXXXXXXX
-	item 1 key (XXXXXX RAID_STRIPE 65536) itemoff XXXXX itemsize 24
-			encoding: RAID0
+	item 1 key (XXXXXX RAID_STRIPE 65536) itemoff XXXXX itemsize 16
  			stripe 0 devid 2 physical XXXXXXXXX
  total bytes XXXXXXXX
  bytes used XXXXXX
@@ -33,8 +31,7 @@ checksum stored <CHECKSUM>
  checksum calced <CHECKSUM>
  fs uuid <UUID>
  chunk uuid <UUID>
-	item 0 key (XXXXXX RAID_STRIPE 131072) itemoff XXXXX itemsize 40
-			encoding: RAID1
+	item 0 key (XXXXXX RAID_STRIPE 131072) itemoff XXXXX itemsize 32
  			stripe 0 devid 1 physical XXXXXXXXX
  			stripe 1 devid 2 physical XXXXXXXXX
  total bytes XXXXXXXX
@@ -52,12 +49,10 @@ checksum stored <CHECKSUM>
  checksum calced <CHECKSUM>
  fs uuid <UUID>
  chunk uuid <UUID>
-	item 0 key (XXXXXX RAID_STRIPE 65536) itemoff XXXXX itemsize 40
-			encoding: RAID10
+	item 0 key (XXXXXX RAID_STRIPE 65536) itemoff XXXXX itemsize 32
  			stripe 0 devid 1 physical XXXXXXXXX
  			stripe 1 devid 2 physical XXXXXXXXX
-	item 1 key (XXXXXX RAID_STRIPE 65536) itemoff XXXXX itemsize 40
-			encoding: RAID10
+	item 1 key (XXXXXX RAID_STRIPE 65536) itemoff XXXXX itemsize 32
  			stripe 0 devid 3 physical XXXXXXXXX
  			stripe 1 devid 4 physical XXXXXXXXX
  total bytes XXXXXXXX
tests/btrfs/308.out +13 -26
index 23b31dd32959..75e010d54252 100644
@@ -16,20 +16,15 @@ checksum stored <CHECKSUM>
  checksum calced <CHECKSUM>
  fs uuid <UUID>
  chunk uuid <UUID>
-	item 0 key (XXXXXX RAID_STRIPE 32768) itemoff XXXXX itemsize 24
-			encoding: RAID0
+	item 0 key (XXXXXX RAID_STRIPE 32768) itemoff XXXXX itemsize 16
  			stripe 0 devid 1 physical XXXXXXXXX
-	item 1 key (XXXXXX RAID_STRIPE 32768) itemoff XXXXX itemsize 24
-			encoding: RAID0
+	item 1 key (XXXXXX RAID_STRIPE 32768) itemoff XXXXX itemsize 16
  			stripe 0 devid 1 physical XXXXXXXXX
-	item 2 key (XXXXXX RAID_STRIPE 65536) itemoff XXXXX itemsize 24
-			encoding: RAID0
+	item 2 key (XXXXXX RAID_STRIPE 65536) itemoff XXXXX itemsize 16
  			stripe 0 devid 2 physical XXXXXXXXX
-	item 3 key (XXXXXX RAID_STRIPE 32768) itemoff XXXXX itemsize 24
-			encoding: RAID0
+	item 3 key (XXXXXX RAID_STRIPE 32768) itemoff XXXXX itemsize 16
  			stripe 0 devid 1 physical XXXXXXXXX
-	item 4 key (XXXXXX RAID_STRIPE 8192) itemoff XXXXX itemsize 24
-			encoding: RAID0
+	item 4 key (XXXXXX RAID_STRIPE 8192) itemoff XXXXX itemsize 16
  			stripe 0 devid 1 physical XXXXXXXXX
  total bytes XXXXXXXX
  bytes used XXXXXX
@@ -50,16 +45,13 @@ checksum stored <CHECKSUM>
  checksum calced <CHECKSUM>
  fs uuid <UUID>
  chunk uuid <UUID>
-	item 0 key (XXXXXX RAID_STRIPE 32768) itemoff XXXXX itemsize 40
-			encoding: RAID1
+	item 0 key (XXXXXX RAID_STRIPE 32768) itemoff XXXXX itemsize 32
  			stripe 0 devid 1 physical XXXXXXXXX
  			stripe 1 devid 2 physical XXXXXXXXX
-	item 1 key (XXXXXX RAID_STRIPE 131072) itemoff XXXXX itemsize 40
-			encoding: RAID1
+	item 1 key (XXXXXX RAID_STRIPE 131072) itemoff XXXXX itemsize 32
  			stripe 0 devid 1 physical XXXXXXXXX
  			stripe 1 devid 2 physical XXXXXXXXX
-	item 2 key (XXXXXX RAID_STRIPE 8192) itemoff XXXXX itemsize 40
-			encoding: RAID1
+	item 2 key (XXXXXX RAID_STRIPE 8192) itemoff XXXXX itemsize 32
  			stripe 0 devid 1 physical XXXXXXXXX
  			stripe 1 devid 2 physical XXXXXXXXX
  total bytes XXXXXXXX
@@ -81,24 +73,19 @@ checksum stored <CHECKSUM>
  checksum calced <CHECKSUM>
  fs uuid <UUID>
  chunk uuid <UUID>
-	item 0 key (XXXXXX RAID_STRIPE 32768) itemoff XXXXX itemsize 40
-			encoding: RAID10
+	item 0 key (XXXXXX RAID_STRIPE 32768) itemoff XXXXX itemsize 32
  			stripe 0 devid 1 physical XXXXXXXXX
  			stripe 1 devid 2 physical XXXXXXXXX
-	item 1 key (XXXXXX RAID_STRIPE 32768) itemoff XXXXX itemsize 40
-			encoding: RAID10
+	item 1 key (XXXXXX RAID_STRIPE 32768) itemoff XXXXX itemsize 32
  			stripe 0 devid 1 physical XXXXXXXXX
  			stripe 1 devid 2 physical XXXXXXXXX
-	item 2 key (XXXXXX RAID_STRIPE 65536) itemoff XXXXX itemsize 40
-			encoding: RAID10
+	item 2 key (XXXXXX RAID_STRIPE 65536) itemoff XXXXX itemsize 32
  			stripe 0 devid 3 physical XXXXXXXXX
  			stripe 1 devid 4 physical XXXXXXXXX
-	item 3 key (XXXXXX RAID_STRIPE 32768) itemoff XXXXX itemsize 40
-			encoding: RAID10
+	item 3 key (XXXXXX RAID_STRIPE 32768) itemoff XXXXX itemsize 32
  			stripe 0 devid 1 physical XXXXXXXXX
  			stripe 1 devid 2 physical XXXXXXXXX
-	item 4 key (XXXXXX RAID_STRIPE 8192) itemoff XXXXX itemsize 40
-			encoding: RAID10
+	item 4 key (XXXXXX RAID_STRIPE 8192) itemoff XXXXX itemsize 32
  			stripe 0 devid 1 physical XXXXXXXXX
  			stripe 1 devid 2 physical XXXXXXXXX
  total bytes XXXXXXXX