btrfs: redirect device replace output to $seqres.full
authorJosef Bacik <josef@toxicpanda.com>
Mon, 22 Nov 2021 14:53:41 +0000 (09:53 -0500)
committerEryu Guan <guaneryu@gmail.com>
Sun, 28 Nov 2021 14:36:22 +0000 (22:36 +0800)
The btrfs utils are printing a status message about TRIM'ing device on
replace and this is throwing off the golden output, redirect stdout from
'device replace start' to $seqres.full so we don't get false negatives.

Signed-off-by: Josef Bacik <josef@toxicpanda.com>
Reviewed-by: Eryu Guan <guaneryu@gmail.com>
Signed-off-by: Eryu Guan <guaneryu@gmail.com>
tests/btrfs/176
tests/btrfs/223

index 0e6230ec799bc7b241af3805e369091f94d02835..33f9a061fe6541b83590a22b0850bd30af37b9be 100755 (executable)
@@ -53,10 +53,12 @@ swapon "$SCRATCH_MNT/swap" 2>&1 | _filter_scratch
 # Again, we know the swap file is on device 1.
 $BTRFS_UTIL_PROG replace start -fB "$scratch_dev1" "$scratch_dev3" "$SCRATCH_MNT" 2>&1 | grep -o "Text file busy"
 # Replacing device 2 should still work.
-$BTRFS_UTIL_PROG replace start -fB "$scratch_dev2" "$scratch_dev3" "$SCRATCH_MNT"
+$BTRFS_UTIL_PROG replace start -fB "$scratch_dev2" "$scratch_dev3" "$SCRATCH_MNT" \
+       >> $seqres.full
 swapoff "$SCRATCH_MNT/swap" > /dev/null 2>&1
 # Replacing device 1 should work again after swapoff.
-$BTRFS_UTIL_PROG replace start -fB "$scratch_dev1" "$scratch_dev2" "$SCRATCH_MNT"
+$BTRFS_UTIL_PROG replace start -fB "$scratch_dev1" "$scratch_dev2" "$SCRATCH_MNT" \
+       >> $seqres.full
 _scratch_unmount
 _check_scratch_fs "$scratch_dev2"
 
index af072ede173203953c23e307f7984d207da2a9e7..8125cdf25770a540a4fefdcdee9258b92c903c84 100755 (executable)
@@ -33,7 +33,7 @@ _require_batched_discard $SCRATCH_MNT
 $XFS_IO_PROG -f -c "pwrite -S 0xab 0 10M" $SCRATCH_MNT/foo | _filter_xfs_io
 
 # Replace the first device, $dev1, with a new device.
-$BTRFS_UTIL_PROG replace start -Bf $dev1 $SPARE_DEV $SCRATCH_MNT
+$BTRFS_UTIL_PROG replace start -Bf $dev1 $SPARE_DEV $SCRATCH_MNT >> $seqres.full
 
 # Run fstrim, it should not trim/discard allocated extents in the new device.
 $FSTRIM_PROG $SCRATCH_MNT