Skip to contentSkip to conversation

xfs/62[3-8]: require XFS_SCRUB_PROG

PATCH In review Darrick J. Wong 3 participants 4 messages Mar 11 – Mar 13

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 xfs/62[3-8]: require XFS_SCRUB_PROG

From: Darrick J. Wong <[email protected]>

QA reports that xfs/62[3-8] fail because they didn't install xfsprogs-xfs_scrub package and this test requires xfs_scrub(8). Add the missing _require call, and update the README so that anyone running fstests on RHEL/Fedora actually get all the necessary components to do a full test of XFS.

Cc <[email protected]> # v2024.06.27
Fixes 4de8fd7860a2bb ("scrub: test correction of directory tree corruptions")
---
 README        |    2 +-
 tests/xfs/623 |    3 +--
 tests/xfs/624 |    3 +--
 tests/xfs/625 |    3 +--
 tests/xfs/626 |    3 +--
 tests/xfs/627 |    3 +--
 tests/xfs/628 |    1 +
 7 files changed, 7 insertions(+), 11 deletions(-)
README +1 -1
index 211e273115f08f..36684cc6572d4b 100644
@@ -126,7 +126,7 @@ Fedora
    $ sudo yum install acl attr automake bc dbench dump e2fsprogs fio gawk gcc \
         gdbm-devel git indent kernel-devel libacl-devel libaio-devel \
         libcap-devel libtool liburing-devel libuuid-devel lvm2 make psmisc \
-        python3 quota sed sqlite udftools  xfsprogs
+        python3 quota sed sqlite udftools xfsprogs xfsprogs-xfs_scrub
 
 2. Install packages for the filesystem(s) being tested:
 
tests/xfs/623 +1 -2
index aff3f903660fa7..7f79ccbcbf7f14 100755
@@ -16,8 +16,7 @@ _begin_fstest auto online_repair
 . ./common/fuzzy
 . ./common/populate
 
-
-# Modify as appropriate.
+_require_scrub
 _require_xfs_db_command "link"
 _require_xfs_db_command "unlink"
 _require_scratch
tests/xfs/624 +1 -2
index e63cfcc6e7ba82..09a922c8d18c8a 100755
@@ -16,8 +16,7 @@ _begin_fstest auto online_repair
 . ./common/fuzzy
 . ./common/populate
 
-
-# Modify as appropriate.
+_require_scrub
 _require_xfs_db_command "link"
 _require_xfs_db_command "unlink"
 _require_scratch
tests/xfs/625 +1 -2
index 23013f195c9e7f..2654216b67aa11 100755
@@ -16,8 +16,7 @@ _begin_fstest auto online_repair
 . ./common/fuzzy
 . ./common/populate
 
-
-# Modify as appropriate.
+_require_scrub
 _require_xfs_db_command "link"
 _require_xfs_db_command "unlink"
 _require_scratch
tests/xfs/626 +1 -2
index c424819cede6e1..3b4cdca4fe4e24 100755
@@ -16,8 +16,7 @@ _begin_fstest auto online_repair
 . ./common/fuzzy
 . ./common/populate
 
-
-# Modify as appropriate.
+_require_scrub
 _require_xfs_db_command "link"
 _require_xfs_db_command "unlink"
 _require_scratch
tests/xfs/627 +1 -2
index 411a7603317058..fc54199b4a95de 100755
@@ -16,8 +16,7 @@ _begin_fstest auto online_repair
 . ./common/fuzzy
 . ./common/populate
 
-
-# Modify as appropriate.
+_require_scrub
 _require_xfs_db_command "link"
 _require_xfs_db_command "unlink"
 _require_scratch
tests/xfs/628 +1 -0
index c77d67db358983..e003f41999f401 100755
@@ -17,6 +17,7 @@ _begin_fstest scrub fsstress_scrub
 . ./common/inject
 . ./common/xfs
 
+_require_scrub
 _require_scratch
 _require_xfs_stress_scrub
 
Reviewed-by on v1 1/1
#2 lore raw
In reply to Darrick J. Wong
Quoted 26 lines · Darrick J. Wong

From: Darrick J. Wong <[email protected]>

QA reports that xfs/62[3-8] fail because they didn't install xfsprogs-xfs_scrub package and this test requires xfs_scrub(8). Add the missing _require call, and update the README so that anyone running fstests on RHEL/Fedora actually get all the necessary components to do a full test of XFS.

Cc <[email protected]> # v2024.06.27
Fixes 4de8fd7860a2bb ("scrub: test correction of directory tree corruptions")
---
 README        |    2 +-
 tests/xfs/623 |    3 +--
 tests/xfs/624 |    3 +--
 tests/xfs/625 |    3 +--
 tests/xfs/626 |    3 +--
 tests/xfs/627 |    3 +--
 tests/xfs/628 |    1 +
 7 files changed, 7 insertions(+), 11 deletions(-)
README +0 -0
index 211e273115f08f..36684cc6572d4b 100644

README Fedora · line 129

Quoted 5 lines
README +1 -1
@@ -126,7 +126,7 @@ Fedora
    $ sudo yum install acl attr automake bc dbench dump e2fsprogs fio gawk gcc \
         gdbm-devel git indent kernel-devel libacl-devel libaio-devel \
         libcap-devel libtool liburing-devel libuuid-devel lvm2 make psmisc \
-        python3 quota sed sqlite udftools  xfsprogs
+        python3 quota sed sqlite udftools xfsprogs xfsprogs-xfs_scrub

Sure,

I’m thinking we could split this package list into "necessary" dependencies and "optional" ones. The "necessary" dependencies would include all packages required for building and basic execution of xfstests, while missing "optional" dependencies would simply result in certain cases being notrun. Any thoughts on this :)

Thanks,
Zorro

Quoted 86 lines
README +0 -0
 2. Install packages for the filesystem(s) being tested:
 
tests/xfs/623 +1 -2
index aff3f903660fa7..7f79ccbcbf7f14 100755
@@ -16,8 +16,7 @@ _begin_fstest auto online_repair
 . ./common/fuzzy
 . ./common/populate
 
-
-# Modify as appropriate.
+_require_scrub
 _require_xfs_db_command "link"
 _require_xfs_db_command "unlink"
 _require_scratch
tests/xfs/624 +1 -2
index e63cfcc6e7ba82..09a922c8d18c8a 100755
@@ -16,8 +16,7 @@ _begin_fstest auto online_repair
 . ./common/fuzzy
 . ./common/populate
 
-
-# Modify as appropriate.
+_require_scrub
 _require_xfs_db_command "link"
 _require_xfs_db_command "unlink"
 _require_scratch
tests/xfs/625 +1 -2
index 23013f195c9e7f..2654216b67aa11 100755
@@ -16,8 +16,7 @@ _begin_fstest auto online_repair
 . ./common/fuzzy
 . ./common/populate
 
-
-# Modify as appropriate.
+_require_scrub
 _require_xfs_db_command "link"
 _require_xfs_db_command "unlink"
 _require_scratch
tests/xfs/626 +1 -2
index c424819cede6e1..3b4cdca4fe4e24 100755
@@ -16,8 +16,7 @@ _begin_fstest auto online_repair
 . ./common/fuzzy
 . ./common/populate
 
-
-# Modify as appropriate.
+_require_scrub
 _require_xfs_db_command "link"
 _require_xfs_db_command "unlink"
 _require_scratch
tests/xfs/627 +1 -2
index 411a7603317058..fc54199b4a95de 100755
@@ -16,8 +16,7 @@ _begin_fstest auto online_repair
 . ./common/fuzzy
 . ./common/populate
 
-
-# Modify as appropriate.
+_require_scrub
 _require_xfs_db_command "link"
 _require_xfs_db_command "unlink"
 _require_scratch
tests/xfs/628 +1 -0
index c77d67db358983..e003f41999f401 100755
@@ -17,6 +17,7 @@ _begin_fstest scrub fsstress_scrub
 . ./common/inject
 . ./common/xfs
 
+_require_scrub
 _require_scratch
 _require_xfs_stress_scrub
 
#3 lore raw
Quoted 35 lines · Zorro Lang
Quoted 26 lines · Darrick J. Wong

From: Darrick J. Wong <[email protected]>

QA reports that xfs/62[3-8] fail because they didn't install xfsprogs-xfs_scrub package and this test requires xfs_scrub(8). Add the missing _require call, and update the README so that anyone running fstests on RHEL/Fedora actually get all the necessary components to do a full test of XFS.

Cc <[email protected]> # v2024.06.27
Fixes 4de8fd7860a2bb ("scrub: test correction of directory tree corruptions")
---
 README        |    2 +-
 tests/xfs/623 |    3 +--
 tests/xfs/624 |    3 +--
 tests/xfs/625 |    3 +--
 tests/xfs/626 |    3 +--
 tests/xfs/627 |    3 +--
 tests/xfs/628 |    1 +
 7 files changed, 7 insertions(+), 11 deletions(-)
README +0 -0
index 211e273115f08f..36684cc6572d4b 100644

README Fedora · line 129

Quoted 5 lines
README +1 -1
@@ -126,7 +126,7 @@ Fedora
    $ sudo yum install acl attr automake bc dbench dump e2fsprogs fio gawk gcc \
         gdbm-devel git indent kernel-devel libacl-devel libaio-devel \
         libcap-devel libtool liburing-devel libuuid-devel lvm2 make psmisc \
-        python3 quota sed sqlite udftools  xfsprogs
+        python3 quota sed sqlite udftools xfsprogs xfsprogs-xfs_scrub

Sure,

Quoted 6 lines

I’m thinking we could split this package list into "necessary" dependencies and "optional" ones. The "necessary" dependencies would include all packages required for building and basic execution of xfstests, while missing "optional" dependencies would simply result in certain cases being notrun. Any thoughts on this :)

Hrmm. Now that I look at README a bit more, we /could/ break things out by what you need to run xfstests at all vs. what you need for specific filesystems. For example, xfsprogs-xfs_scrub is really only necessary for testing XFS itself, but xfsprogs is needed even if you're testing ext4.

Oh. The RHEL/Centos sections actually do that, and the only difference between Fedora and RHEL/Centos seem to be that you have to configure EPEL repos for !Fedora.

Those sections really ought to be merged to avoid repetition. Also I'm pretty sure RHEL is supposed to use dnf not yum nowadays.

--D

Quoted 91 lines

Thanks,
Zorro

Quoted 86 lines
README +0 -0
 2. Install packages for the filesystem(s) being tested:
 
tests/xfs/623 +1 -2
index aff3f903660fa7..7f79ccbcbf7f14 100755
@@ -16,8 +16,7 @@ _begin_fstest auto online_repair
 . ./common/fuzzy
 . ./common/populate
 
-
-# Modify as appropriate.
+_require_scrub
 _require_xfs_db_command "link"
 _require_xfs_db_command "unlink"
 _require_scratch
tests/xfs/624 +1 -2
index e63cfcc6e7ba82..09a922c8d18c8a 100755
@@ -16,8 +16,7 @@ _begin_fstest auto online_repair
 . ./common/fuzzy
 . ./common/populate
 
-
-# Modify as appropriate.
+_require_scrub
 _require_xfs_db_command "link"
 _require_xfs_db_command "unlink"
 _require_scratch
tests/xfs/625 +1 -2
index 23013f195c9e7f..2654216b67aa11 100755
@@ -16,8 +16,7 @@ _begin_fstest auto online_repair
 . ./common/fuzzy
 . ./common/populate
 
-
-# Modify as appropriate.
+_require_scrub
 _require_xfs_db_command "link"
 _require_xfs_db_command "unlink"
 _require_scratch
tests/xfs/626 +1 -2
index c424819cede6e1..3b4cdca4fe4e24 100755
@@ -16,8 +16,7 @@ _begin_fstest auto online_repair
 . ./common/fuzzy
 . ./common/populate
 
-
-# Modify as appropriate.
+_require_scrub
 _require_xfs_db_command "link"
 _require_xfs_db_command "unlink"
 _require_scratch
tests/xfs/627 +1 -2
index 411a7603317058..fc54199b4a95de 100755
@@ -16,8 +16,7 @@ _begin_fstest auto online_repair
 . ./common/fuzzy
 . ./common/populate
 
-
-# Modify as appropriate.
+_require_scrub
 _require_xfs_db_command "link"
 _require_xfs_db_command "unlink"
 _require_scratch
tests/xfs/628 +1 -0
index c77d67db358983..e003f41999f401 100755
@@ -17,6 +17,7 @@ _begin_fstest scrub fsstress_scrub
 . ./common/inject
 . ./common/xfs
 
+_require_scrub
 _require_scratch
 _require_xfs_stress_scrub