FS/XFS testing framework
 help / color / mirror / Atom feed
* [PATCH v2] fstests: btrfs/340: add support for older kernels/progs
@ 2026-05-14  9:04 Qu Wenruo
  2026-05-15 16:55 ` Zorro Lang
  0 siblings, 1 reply; 2+ messages in thread
From: Qu Wenruo @ 2026-05-14  9:04 UTC (permalink / raw)
  To: fstests, linux-btrfs; +Cc: Long An

The test case will fail on older distros like SLE12-SP5, there are two
problems on the test case itself:

- Requires "--sync" option from "btrfs qgroup show" subcommand
  That option was introduecd in v4.9.1, thus there are still some older
  distros using that very old version.

- Not all kernels support quick inherit
  The kernel commit introducing the quick inherit is 6.9, thus some
  supported LTS kernels do not have that commit.

  In that case qgroup will just be marked inconsistent, this will cause
  the later "btrfs qgroup show" command to output a warning due to the
  inconsistent flag.

Fix both problems by:

- Require "--sync" option from "btrfs qgroup show" subcommand
  So older distros will just skip the test.

- Redirect all output from "btrfs qgroup show" to $seqres.full
  So older kernels can still pass the test case by marking qgroup
  inconsitent.

Reported-by: Long An <lan@suse.com>
Signed-off-by: Qu Wenruo <wqu@suse.com>
---
Changelog:
v2:
- Fix the mismatch between the commit message and the test case change
  Forgot to amend the changes before sending.

- Fix a bug in the stderr redirect
  The stdout redirect should be put last.
---
 tests/btrfs/340 | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/tests/btrfs/340 b/tests/btrfs/340
index 872f790cb975..eff76d0b633c 100755
--- a/tests/btrfs/340
+++ b/tests/btrfs/340
@@ -16,6 +16,7 @@ _fixed_by_kernel_commit 68d4b3fa18d7 \
 # For the automatic fsck at unmount.
 _require_scratch
 _require_btrfs_qgroup_report
+_require_btrfs_command qgroup show --sync
 
 # This will imply mkfs and enable regular qgroup.
 _require_scratch_qgroup
@@ -39,7 +40,12 @@ _btrfs qgroup show -p --sync $SCRATCH_MNT >> $seqres.full
 # without marking qgroup inconsistent.
 _btrfs subv snap -i 1/1 $SCRATCH_MNT/subv1 $SCRATCH_MNT/snap1
 echo "After quick inherit:" >> $seqres.full
-_btrfs qgroup show -p --sync $SCRATCH_MNT >> $seqres.full
+# Redirect all output to seqres.full including stderr.
+# For older kernels without quick inherit support, it will mark
+# qgroup inconsistent, which will output a warning about the inconsistent
+# numbers. Here we rely on the final btrfs check to catch any qgroup number
+# errors, thus no need to bother that possible warning.
+_btrfs qgroup show -p --sync $SCRATCH_MNT >> $seqres.full 2>&1
 
 echo "Silence is golden"
 _exit 0
-- 
2.54.0


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH v2] fstests: btrfs/340: add support for older kernels/progs
  2026-05-14  9:04 [PATCH v2] fstests: btrfs/340: add support for older kernels/progs Qu Wenruo
@ 2026-05-15 16:55 ` Zorro Lang
  0 siblings, 0 replies; 2+ messages in thread
From: Zorro Lang @ 2026-05-15 16:55 UTC (permalink / raw)
  To: Qu Wenruo; +Cc: fstests, linux-btrfs, Long An

On Thu, May 14, 2026 at 06:34:39PM +0930, Qu Wenruo wrote:
> The test case will fail on older distros like SLE12-SP5, there are two
> problems on the test case itself:
> 
> - Requires "--sync" option from "btrfs qgroup show" subcommand
>   That option was introduecd in v4.9.1, thus there are still some older
>   distros using that very old version.
> 
> - Not all kernels support quick inherit
>   The kernel commit introducing the quick inherit is 6.9, thus some
>   supported LTS kernels do not have that commit.
> 
>   In that case qgroup will just be marked inconsistent, this will cause
>   the later "btrfs qgroup show" command to output a warning due to the
>   inconsistent flag.
> 
> Fix both problems by:
> 
> - Require "--sync" option from "btrfs qgroup show" subcommand
>   So older distros will just skip the test.
> 
> - Redirect all output from "btrfs qgroup show" to $seqres.full
>   So older kernels can still pass the test case by marking qgroup
>   inconsitent.
> 
> Reported-by: Long An <lan@suse.com>
> Signed-off-by: Qu Wenruo <wqu@suse.com>
> ---
> Changelog:
> v2:
> - Fix the mismatch between the commit message and the test case change
>   Forgot to amend the changes before sending.
> 
> - Fix a bug in the stderr redirect
>   The stdout redirect should be put last.

Sorry, did I miss part of the discussion? Why did v2 switch to notrun for
older tools instead of using the compatible `btrfs filesystem sync` from v1?
Was there something wrong with the v1 method :)

Thanks,
Zorro

> ---
>  tests/btrfs/340 | 8 +++++++-
>  1 file changed, 7 insertions(+), 1 deletion(-)
> 
> diff --git a/tests/btrfs/340 b/tests/btrfs/340
> index 872f790cb975..eff76d0b633c 100755
> --- a/tests/btrfs/340
> +++ b/tests/btrfs/340
> @@ -16,6 +16,7 @@ _fixed_by_kernel_commit 68d4b3fa18d7 \
>  # For the automatic fsck at unmount.
>  _require_scratch
>  _require_btrfs_qgroup_report
> +_require_btrfs_command qgroup show --sync
>  
>  # This will imply mkfs and enable regular qgroup.
>  _require_scratch_qgroup
> @@ -39,7 +40,12 @@ _btrfs qgroup show -p --sync $SCRATCH_MNT >> $seqres.full
>  # without marking qgroup inconsistent.
>  _btrfs subv snap -i 1/1 $SCRATCH_MNT/subv1 $SCRATCH_MNT/snap1
>  echo "After quick inherit:" >> $seqres.full
> -_btrfs qgroup show -p --sync $SCRATCH_MNT >> $seqres.full
> +# Redirect all output to seqres.full including stderr.
> +# For older kernels without quick inherit support, it will mark
> +# qgroup inconsistent, which will output a warning about the inconsistent
> +# numbers. Here we rely on the final btrfs check to catch any qgroup number
> +# errors, thus no need to bother that possible warning.
> +_btrfs qgroup show -p --sync $SCRATCH_MNT >> $seqres.full 2>&1
>  
>  echo "Silence is golden"
>  _exit 0
> -- 
> 2.54.0
> 
> 

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2026-05-15 16:55 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-05-14  9:04 [PATCH v2] fstests: btrfs/340: add support for older kernels/progs Qu Wenruo
2026-05-15 16:55 ` Zorro Lang

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox