| Message ID | 156089204777.345809.18314859473454869520.stgit@magnolia (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | fstests: various fixes | expand |
On Tue, Jun 18, 2019 at 02:07:27PM -0700, Darrick J. Wong wrote: > From: Darrick J. Wong <darrick.wong@oracle.com> > > This test originally exported its own MKFS_OPTIONS to force the tested > filesystem config to the mkfs defaults + test-specific log size options. > This overrides whatever the test runner might have set in MKFS_OPTIONS. > > In commit 2fd273886b525 ("xfs: refactor minimum log size formatting > code") we fail to export our test-specific MKFS_OPTIONS before > calculating the minimum log size, which leads to the wrong min log size > being calculated once we fixed the helper to be smarter about mkfs options. > > Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> I'll apply this one along with patch 2/4, once that one is updated. Thanks, Eryu > --- > tests/xfs/119 | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > > diff --git a/tests/xfs/119 b/tests/xfs/119 > index 8825a5c3..f245a0a6 100755 > --- a/tests/xfs/119 > +++ b/tests/xfs/119 > @@ -38,7 +38,8 @@ _require_scratch > # this may hang > sync > > -logblks=$(_scratch_find_xfs_min_logblocks -l version=2,su=64k) > +export MKFS_OPTIONS="-l version=2,su=64k" > +logblks=$(_scratch_find_xfs_min_logblocks) > export MKFS_OPTIONS="-l version=2,size=${logblks}b,su=64k" > export MOUNT_OPTIONS="-o logbsize=64k" > _scratch_mkfs_xfs >/dev/null >
On 6/18/19 2:07 PM, Darrick J. Wong wrote: > From: Darrick J. Wong <darrick.wong@oracle.com> > > This test originally exported its own MKFS_OPTIONS to force the tested > filesystem config to the mkfs defaults + test-specific log size options. > This overrides whatever the test runner might have set in MKFS_OPTIONS. > > In commit 2fd273886b525 ("xfs: refactor minimum log size formatting > code") we fail to export our test-specific MKFS_OPTIONS before > calculating the minimum log size, which leads to the wrong min log size > being calculated once we fixed the helper to be smarter about mkfs options. > > Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Looks ok to me Reviewed-by: Allison Collins <allison.henderson@oracle.com> > --- > tests/xfs/119 | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > > diff --git a/tests/xfs/119 b/tests/xfs/119 > index 8825a5c3..f245a0a6 100755 > --- a/tests/xfs/119 > +++ b/tests/xfs/119 > @@ -38,7 +38,8 @@ _require_scratch > # this may hang > sync > > -logblks=$(_scratch_find_xfs_min_logblocks -l version=2,su=64k) > +export MKFS_OPTIONS="-l version=2,su=64k" > +logblks=$(_scratch_find_xfs_min_logblocks) > export MKFS_OPTIONS="-l version=2,size=${logblks}b,su=64k" > export MOUNT_OPTIONS="-o logbsize=64k" > _scratch_mkfs_xfs >/dev/null >
diff --git a/tests/xfs/119 b/tests/xfs/119 index 8825a5c3..f245a0a6 100755 --- a/tests/xfs/119 +++ b/tests/xfs/119 @@ -38,7 +38,8 @@ _require_scratch # this may hang sync -logblks=$(_scratch_find_xfs_min_logblocks -l version=2,su=64k) +export MKFS_OPTIONS="-l version=2,su=64k" +logblks=$(_scratch_find_xfs_min_logblocks) export MKFS_OPTIONS="-l version=2,size=${logblks}b,su=64k" export MOUNT_OPTIONS="-o logbsize=64k" _scratch_mkfs_xfs >/dev/null