Skip to contentSkip to conversation

fstests: btrfs/021: redirect the output of defrag command

PATCH In review Qu Wenruo 2 participants 2 messages Nov 13, 2022 – Nov 14, 2022 Btrfs file system

lore
Share & tools
lore

Qu Wenruo

author
#0 lore raw

PATCH 1/1 fstests: btrfs/021: redirect the output of defrag command

[BUG]
Test case btrfs/021 will fail with v6.0 btrfs-progs, with the extra output:

     QA output created by 021
    +/mnt/scratch/padding-0
    +/mnt/scratch/padding-1
    +/mnt/scratch/padding-2
    +/mnt/scratch/padding-3
    +/mnt/scratch/padding-4
    +/mnt/scratch/padding-5
    ...

[CAUSE]
In fact this is a btrfs-progs bug, btrfs-progs commit db2f85c8751c ("btrfs-progs: fi defrag: add global verbose option") changed the output level of defrag command.

[FIX]
This will be fixed in btrfs-progs, while as a workaround we can redirect the stdout into $seqres.full.

If we hit some error, the stderr will still pollute the golden output and be caught by the test case.

---
 tests/btrfs/021 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tests/btrfs/021 +1 -1
index 5943da2f..6b6383cb 100755
@@ -23,7 +23,7 @@ run_test()
 	sleep 0.5
 
 	find $SCRATCH_MNT -type f -print0 | xargs -0 \
-	$BTRFS_UTIL_PROG filesystem defrag -f
+	$BTRFS_UTIL_PROG filesystem defrag -f >> $seqres.full
 
 	sync
 	wait
Signature · 1 line
2.38.0
#1 lore raw
Quoted 36 lines · Qu Wenruo

[BUG]
Test case btrfs/021 will fail with v6.0 btrfs-progs, with the extra output:

     QA output created by 021
    +/mnt/scratch/padding-0
    +/mnt/scratch/padding-1
    +/mnt/scratch/padding-2
    +/mnt/scratch/padding-3
    +/mnt/scratch/padding-4
    +/mnt/scratch/padding-5
    ...

[CAUSE]
In fact this is a btrfs-progs bug, btrfs-progs commit db2f85c8751c ("btrfs-progs: fi defrag: add global verbose option") changed the output level of defrag command.

[FIX]
This will be fixed in btrfs-progs, while as a workaround we can redirect the stdout into $seqres.full.

If we hit some error, the stderr will still pollute the golden output and be caught by the test case.

---
 tests/btrfs/021 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tests/btrfs/021 +0 -0
index 5943da2f..6b6383cb 100755

tests/btrfs/021 run_test() · line 26

Quoted 5 lines
tests/btrfs/021 +1 -1
@@ -23,7 +23,7 @@ run_test()
        sleep 0.5
 
        find $SCRATCH_MNT -type f -print0 | xargs -0 \
-       $BTRFS_UTIL_PROG filesystem defrag -f
+       $BTRFS_UTIL_PROG filesystem defrag -f >> $seqres.full

Already sent a fix for this last week (plus this misses btrfs/256):

https://lore.kernel.org/fstests/e393451cb53b6b81804eaa41c6461b07a910eb62.1668011769.git.fdmanana@suse.com/

Thanks.

Quoted 6 lines
tests/btrfs/021 +0 -1
        sync
        wait
--

2.38.0