Skip to contentSkip to conversation

btrfs/177: Ignore resize output message

PATCH In review Marcos Paulo de Souza 2 participants 2 messages Jul 27, 2021 – Jul 28, 2021 Btrfs file system

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 btrfs/177: Ignore resize output message

Commit 78aa1d95dd99 ("btrfs-progs: fi resize: make output more readable") added the device id of the resized fs along with a pretty printed size. Remove the resize output message from 117.out.

---

Qu, btrfs/217 is also ignoring the resize output, so I believe it would be easier if we do the same here. We would see other problems if the resize fail, so I think we are safe here.

 tests/btrfs/177     | 5 ++---
 tests/btrfs/177.out | 2 --
 2 files changed, 2 insertions(+), 5 deletions(-)
tests/btrfs/177 +2 -3
index 966d29d7..f59f54a7 100755
@@ -36,8 +36,7 @@ dd if=/dev/zero of="$SCRATCH_MNT/refill" bs=4096 >> $seqres.full 2>&1
 # Now add more space and create a swap file. We know that the first $fssize
 # of the filesystem was used, so the swap file must be in the new part of the
 # filesystem.
-$BTRFS_UTIL_PROG filesystem resize $((3 * fssize)) "$SCRATCH_MNT" | \
-							_filter_scratch
+$BTRFS_UTIL_PROG filesystem resize $((3 * fssize)) "$SCRATCH_MNT" >>$seqres.full
 _format_swapfile "$swapfile" $((32 * 1024 * 1024))
 swapon "$swapfile"
 
@@ -55,7 +54,7 @@ $BTRFS_UTIL_PROG filesystem resize 1G "$SCRATCH_MNT" 2>&1 | grep -o "Text file b
 swapoff "$swapfile"
 
 # It should work again after swapoff.
-$BTRFS_UTIL_PROG filesystem resize $fssize "$SCRATCH_MNT" | _filter_scratch
+$BTRFS_UTIL_PROG filesystem resize $fssize "$SCRATCH_MNT" >>$seqres.full
 
 status=0
 exit
tests/btrfs/177.out +0 -2
index 63aca0e5..0293ee36 100644
@@ -1,4 +1,2 @@
 QA output created by 177
-Resize 'SCRATCH_MNT' of '3221225472'
 Text file busy
-Resize 'SCRATCH_MNT' of '1073741824'
Signature · 1 line
2.26.2
#1 lore raw
Quoted 10 lines · Marcos Paulo de Souza

Commit 78aa1d95dd99 ("btrfs-progs: fi resize: make output more readable") added the device id of the resized fs along with a pretty printed size. Remove the resize output message from 117.out.

---

Qu, btrfs/217 is also ignoring the resize output, so I believe it would be easier if we do the same here. We would see other problems if the resize fail, so I think we are safe here.

But unfortunately, we have hit case where the output of the resize commands is insane.

One recent regression is, resize will always output the resized size as 0.

Thus I believe we may still want to properly check the output value. Although I don't think it should be in golden output.

Thanks,
Qu

Quoted 38 lines
  tests/btrfs/177     | 5 ++---
  tests/btrfs/177.out | 2 --
  2 files changed, 2 insertions(+), 5 deletions(-)
tests/btrfs/177 +2 -3
index 966d29d7..f59f54a7 100755
@@ -36,8 +36,7 @@ dd if=/dev/zero of="$SCRATCH_MNT/refill" bs=4096 >> $seqres.full 2>&1
  # Now add more space and create a swap file. We know that the first $fssize
  # of the filesystem was used, so the swap file must be in the new part of the
  # filesystem.
-$BTRFS_UTIL_PROG filesystem resize $((3 * fssize)) "$SCRATCH_MNT" | \
-							_filter_scratch
+$BTRFS_UTIL_PROG filesystem resize $((3 * fssize)) "$SCRATCH_MNT" >>$seqres.full
  _format_swapfile "$swapfile" $((32 * 1024 * 1024))
  swapon "$swapfile"
 
@@ -55,7 +54,7 @@ $BTRFS_UTIL_PROG filesystem resize 1G "$SCRATCH_MNT" 2>&1 | grep -o "Text file b
  swapoff "$swapfile"
 
  # It should work again after swapoff.
-$BTRFS_UTIL_PROG filesystem resize $fssize "$SCRATCH_MNT" | _filter_scratch
+$BTRFS_UTIL_PROG filesystem resize $fssize "$SCRATCH_MNT" >>$seqres.full
 
  status=0
  exit
tests/btrfs/177.out +0 -2
index 63aca0e5..0293ee36 100644
@@ -1,4 +1,2 @@
  QA output created by 177
-Resize 'SCRATCH_MNT' of '3221225472'
  Text file busy
-Resize 'SCRATCH_MNT' of '1073741824'