* Test 272 fails for ext3 @ 2012-08-16 9:28 Jan Kara 2012-08-16 9:37 ` Jan Kara 0 siblings, 1 reply; 9+ messages in thread From: Jan Kara @ 2012-08-16 9:28 UTC (permalink / raw) To: xfstests; +Cc: dmonakhov, linux-ext4 [-- Attachment #1: Type: text/plain, Size: 527 bytes --] Hello, I was looking into why test 272 from xfstests fails for ext3 and the reason is that ext3 does not support direct IO to file with enabled data journalling (open returns EINVAL because ->direct_IO callback is not specified). So I was thinking how to accomodate this fact in the test - the best I found was to just check using xfs_io whether O_DIRECT open succeeds and perform the test only in that case. Attached patch does this or do people have other ideas? Honza -- Jan Kara <jack@suse.cz> SUSE Labs, CR [-- Attachment #2: 0001-Make-test-272-work-for-ext3.patch --] [-- Type: text/x-patch, Size: 999 bytes --] >From 529429c8497314ef956e470fdb9b94bfe797df69 Mon Sep 17 00:00:00 2001 From: Jan Kara <jack@suse.cz> Date: Thu, 16 Aug 2012 11:14:35 +0200 Subject: [PATCH] Make test 272 work for ext3 ext3 does not support direct IO for files with data journalling. This confuses test 272. Make the test check whether open succeeds and perform the writing only if it does. Signed-off-by: Jan Kara <jack@suse.cz> --- 272 | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/272 b/272 index 26dfa3b..e39c52b 100755 --- a/272 +++ b/272 @@ -52,6 +52,12 @@ _workout() echo "OP write_opt: $write_opt 4M, \ chattr_opt: $chattr_opt" + if [ "$write_opt" = "oflag=direct" ]; then + # Some filesystems don't support direct IO + # in some cases, check for that + xfs_io -F -d -f -c "" $SCRATCH_MNT/file.$idx \ + >> $seq.full 2>&1 || continue + fi dd if=/dev/zero of=$SCRATCH_MNT/file.$idx \ bs=1M count=4 $write_opt \ >> $seq.full 2>&1 || exit -- 1.7.1 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Test 272 fails for ext3 2012-08-16 9:28 Test 272 fails for ext3 Jan Kara @ 2012-08-16 9:37 ` Jan Kara 2012-08-16 10:07 ` Dmitry Monakhov 2012-08-16 22:48 ` Dave Chinner 0 siblings, 2 replies; 9+ messages in thread From: Jan Kara @ 2012-08-16 9:37 UTC (permalink / raw) To: xfs; +Cc: dmonakhov, linux-ext4 [-- Attachment #1: Type: text/plain, Size: 606 bytes --] Hello, I was looking into why test 272 from xfstests fails for ext3 and the reason is that ext3 does not support direct IO to file with enabled data journalling (open returns EINVAL because ->direct_IO callback is not specified). So I was thinking how to accomodate this fact in the test - the best I found was to just check using xfs_io whether O_DIRECT open succeeds and perform the test only in that case. Attached patch does this or do people have other ideas? Honza PS: Sending again with correct list address. I'm sorry for unnecessary email. -- Jan Kara <jack@suse.cz> SUSE Labs, CR [-- Attachment #2: 0001-Make-test-272-work-for-ext3.patch --] [-- Type: text/x-patch, Size: 999 bytes --] >From 529429c8497314ef956e470fdb9b94bfe797df69 Mon Sep 17 00:00:00 2001 From: Jan Kara <jack@suse.cz> Date: Thu, 16 Aug 2012 11:14:35 +0200 Subject: [PATCH] Make test 272 work for ext3 ext3 does not support direct IO for files with data journalling. This confuses test 272. Make the test check whether open succeeds and perform the writing only if it does. Signed-off-by: Jan Kara <jack@suse.cz> --- 272 | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/272 b/272 index 26dfa3b..e39c52b 100755 --- a/272 +++ b/272 @@ -52,6 +52,12 @@ _workout() echo "OP write_opt: $write_opt 4M, \ chattr_opt: $chattr_opt" + if [ "$write_opt" = "oflag=direct" ]; then + # Some filesystems don't support direct IO + # in some cases, check for that + xfs_io -F -d -f -c "" $SCRATCH_MNT/file.$idx \ + >> $seq.full 2>&1 || continue + fi dd if=/dev/zero of=$SCRATCH_MNT/file.$idx \ bs=1M count=4 $write_opt \ >> $seq.full 2>&1 || exit -- 1.7.1 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: Test 272 fails for ext3 2012-08-16 9:37 ` Jan Kara @ 2012-08-16 10:07 ` Dmitry Monakhov 2012-08-16 22:48 ` Dave Chinner 1 sibling, 0 replies; 9+ messages in thread From: Dmitry Monakhov @ 2012-08-16 10:07 UTC (permalink / raw) To: Jan Kara, xfs; +Cc: linux-ext4 On Thu, 16 Aug 2012 11:37:57 +0200, Jan Kara <jack@suse.cz> wrote: Non-text part: multipart/mixed > Hello, > > I was looking into why test 272 from xfstests fails for ext3 and the > reason is that ext3 does not support direct IO to file with enabled data > journalling (open returns EINVAL because ->direct_IO callback is not > specified). So I was thinking how to accomodate this fact in the test - > the best I found was to just check using xfs_io whether O_DIRECT open > succeeds and perform the test only in that case. Attached patch does this > or do people have other ideas? Looks reasonable ACK. > > Honza > > PS: Sending again with correct list address. I'm sorry for unnecessary email. > -- > Jan Kara <jack@suse.cz> > SUSE Labs, CR > From 529429c8497314ef956e470fdb9b94bfe797df69 Mon Sep 17 00:00:00 2001 > From: Jan Kara <jack@suse.cz> > Date: Thu, 16 Aug 2012 11:14:35 +0200 > Subject: [PATCH] Make test 272 work for ext3 > > ext3 does not support direct IO for files with data journalling. This > confuses test 272. Make the test check whether open succeeds and perform > the writing only if it does. > > Signed-off-by: Jan Kara <jack@suse.cz> > --- > 272 | 6 ++++++ > 1 files changed, 6 insertions(+), 0 deletions(-) > > diff --git a/272 b/272 > index 26dfa3b..e39c52b 100755 > --- a/272 > +++ b/272 > @@ -52,6 +52,12 @@ _workout() > > echo "OP write_opt: $write_opt 4M, \ > chattr_opt: $chattr_opt" > + if [ "$write_opt" = "oflag=direct" ]; then > + # Some filesystems don't support direct IO > + # in some cases, check for that > + xfs_io -F -d -f -c "" $SCRATCH_MNT/file.$idx \ > + >> $seq.full 2>&1 || continue > + fi > dd if=/dev/zero of=$SCRATCH_MNT/file.$idx \ > bs=1M count=4 $write_opt \ > >> $seq.full 2>&1 || exit > -- > 1.7.1 > ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: Test 272 fails for ext3 2012-08-16 9:37 ` Jan Kara 2012-08-16 10:07 ` Dmitry Monakhov @ 2012-08-16 22:48 ` Dave Chinner 2012-08-20 16:22 ` Jan Kara 1 sibling, 1 reply; 9+ messages in thread From: Dave Chinner @ 2012-08-16 22:48 UTC (permalink / raw) To: Jan Kara; +Cc: linux-ext4, dmonakhov, xfs On Thu, Aug 16, 2012 at 11:37:57AM +0200, Jan Kara wrote: > Hello, > > I was looking into why test 272 from xfstests fails for ext3 and the > reason is that ext3 does not support direct IO to file with enabled data > journalling (open returns EINVAL because ->direct_IO callback is not > specified). So I was thinking how to accomodate this fact in the test - > the best I found was to just check using xfs_io whether O_DIRECT open > succeeds and perform the test only in that case. Attached patch does this > or do people have other ideas? # ext3 doesn't support direct IO in journalling mode ext3_write_opt_list="iflag=noatime conv=notrunc conv=fsync" ext4_write_opt_list="iflag=noatime conv=notrunc conv=fsync oflag=direct" if [ $FSTYP = "ext3" ]; then write_opt_list="$ext3_write_opt_list" else write_opt_list="$ext4_write_opt_list" fi ..... > diff --git a/272 b/272 > index 26dfa3b..e39c52b 100755 > --- a/272 > +++ b/272 > @@ -52,6 +52,12 @@ _workout() > > echo "OP write_opt: $write_opt 4M, \ > chattr_opt: $chattr_opt" > + if [ "$write_opt" = "oflag=direct" ]; then > + # Some filesystems don't support direct IO > + # in some cases, check for that > + xfs_io -F -d -f -c "" $SCRATCH_MNT/file.$idx \ > + >> $seq.full 2>&1 || continue > + fi That only fixes one of the two places that does direct IO on a jounralled file. The above will fix both... Cheers, Dave. -- Dave Chinner david@fromorbit.com _______________________________________________ xfs mailing list xfs@oss.sgi.com http://oss.sgi.com/mailman/listinfo/xfs ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: Test 272 fails for ext3 2012-08-16 22:48 ` Dave Chinner @ 2012-08-20 16:22 ` Jan Kara 2012-08-20 21:06 ` Jan Kara 0 siblings, 1 reply; 9+ messages in thread From: Jan Kara @ 2012-08-20 16:22 UTC (permalink / raw) To: Dave Chinner; +Cc: Jan Kara, xfs, dmonakhov, linux-ext4 [-- Attachment #1: Type: text/plain, Size: 1188 bytes --] On Fri 17-08-12 08:48:58, Dave Chinner wrote: > On Thu, Aug 16, 2012 at 11:37:57AM +0200, Jan Kara wrote: > > Hello, > > > > I was looking into why test 272 from xfstests fails for ext3 and the > > reason is that ext3 does not support direct IO to file with enabled data > > journalling (open returns EINVAL because ->direct_IO callback is not > > specified). So I was thinking how to accomodate this fact in the test - > > the best I found was to just check using xfs_io whether O_DIRECT open > > succeeds and perform the test only in that case. Attached patch does this > > or do people have other ideas? > > > # ext3 doesn't support direct IO in journalling mode > ext3_write_opt_list="iflag=noatime conv=notrunc conv=fsync" > ext4_write_opt_list="iflag=noatime conv=notrunc conv=fsync oflag=direct" > > if [ $FSTYP = "ext3" ]; then > write_opt_list="$ext3_write_opt_list" > else > write_opt_list="$ext4_write_opt_list" > fi Yeah, this is probably simpler. Thanks for suggestion. BTW, ext4 also does not support direct IO and data journalling but it silently falls back to buffered IO. Anyway new patch is attached. Honza -- Jan Kara <jack@suse.cz> SUSE Labs, CR [-- Attachment #2: 0001-Make-test-272-work-for-ext3.patch --] [-- Type: text/x-patch, Size: 1249 bytes --] >From 563edb54e3f3a45b5c92ab21bbe41deacef0ae39 Mon Sep 17 00:00:00 2001 From: Jan Kara <jack@suse.cz> Date: Thu, 16 Aug 2012 11:14:35 +0200 Subject: [PATCH v2] Make test 272 work for ext3 ext3 does not support direct IO for files with data journalling. This confuses test 272. Make the test check whether open succeeds and perform the writing only if it does. Thanks for Dave Chinner for suggesting a simpler way to fix the test. Signed-off-by: Jan Kara <jack@suse.cz> --- 272 | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/272 b/272 index 26dfa3b..7b142e2 100755 --- a/272 +++ b/272 @@ -32,6 +32,12 @@ tmp=/tmp/$$ status=1 # failure is the default! trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15 +write_opt_list="iflag=noatime conv=notrunc conv=fsync oflag=direct" +if [ $FSTYP = "ext3" ]; then + # ext3 doesn't support direct IO in journalling mode + write_opt_list="iflag=noatime conv=notrunc conv=fsync" +fi + # get standard environment, filters and checks . ./common.rc . ./common.filter @@ -40,7 +46,6 @@ _workout() echo "" echo " Switch data journalling mode" echo "" - write_opt_list="iflag=noatime conv=notrunc conv=fsync oflag=direct" chattr_opt_list="+j -j +jS -j" idx=0 # -- 1.7.1 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: Test 272 fails for ext3 2012-08-20 16:22 ` Jan Kara @ 2012-08-20 21:06 ` Jan Kara 2012-08-20 22:49 ` Dave Chinner 0 siblings, 1 reply; 9+ messages in thread From: Jan Kara @ 2012-08-20 21:06 UTC (permalink / raw) To: Dave Chinner; +Cc: Jan Kara, xfs, dmonakhov, linux-ext4 [-- Attachment #1: Type: text/plain, Size: 1569 bytes --] On Mon 20-08-12 18:22:12, Jan Kara wrote: > On Fri 17-08-12 08:48:58, Dave Chinner wrote: > > On Thu, Aug 16, 2012 at 11:37:57AM +0200, Jan Kara wrote: > > > Hello, > > > > > > I was looking into why test 272 from xfstests fails for ext3 and the > > > reason is that ext3 does not support direct IO to file with enabled data > > > journalling (open returns EINVAL because ->direct_IO callback is not > > > specified). So I was thinking how to accomodate this fact in the test - > > > the best I found was to just check using xfs_io whether O_DIRECT open > > > succeeds and perform the test only in that case. Attached patch does this > > > or do people have other ideas? > > > > > > # ext3 doesn't support direct IO in journalling mode > > ext3_write_opt_list="iflag=noatime conv=notrunc conv=fsync" > > ext4_write_opt_list="iflag=noatime conv=notrunc conv=fsync oflag=direct" > > > > if [ $FSTYP = "ext3" ]; then > > write_opt_list="$ext3_write_opt_list" > > else > > write_opt_list="$ext4_write_opt_list" > > fi > Yeah, this is probably simpler. Thanks for suggestion. BTW, ext4 also > does not support direct IO and data journalling but it silently falls back > to buffered IO. Anyway new patch is attached. Hum, after testing this I realized why I did the things the original way. The test writes a message with title for each test so when direct IO tests are skipped outputs don't match. After some thought I decided to change the test to output titles only to full output and keep compared output (almost) empty. Result is attached. Honza [-- Attachment #2: 0001-Make-test-272-work-for-ext3.patch --] [-- Type: text/x-patch, Size: 3719 bytes --] >From 170ff81c2ba12e0c7d30d21fa9401a459638e8eb Mon Sep 17 00:00:00 2001 From: Jan Kara <jack@suse.cz> Date: Thu, 16 Aug 2012 11:14:35 +0200 Subject: [PATCH v3] Make test 272 work for ext3 ext3 does not support direct IO for files with data journalling. This confuses test 272. Make the test check whether open succeeds and perform the writing only if it does. Thanks for Dave Chinner for suggesting a simpler way to fix the test. Signed-off-by: Jan Kara <jack@suse.cz> --- 272 | 15 +++++++++------ 272.out | 36 +----------------------------------- 2 files changed, 10 insertions(+), 41 deletions(-) diff --git a/272 b/272 index 26dfa3b..21559ff 100755 --- a/272 +++ b/272 @@ -32,15 +32,18 @@ tmp=/tmp/$$ status=1 # failure is the default! trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15 +write_opt_list="iflag=noatime conv=notrunc conv=fsync oflag=direct" +if [ $FSTYP = "ext3" ]; then + # ext3 doesn't support direct IO in journalling mode + write_opt_list="iflag=noatime conv=notrunc conv=fsync" +fi + # get standard environment, filters and checks . ./common.rc . ./common.filter _workout() { - echo "" - echo " Switch data journalling mode" - echo "" - write_opt_list="iflag=noatime conv=notrunc conv=fsync oflag=direct" + echo "Switch data journalling mode. Silence is golden." chattr_opt_list="+j -j +jS -j" idx=0 # @@ -51,7 +54,7 @@ _workout() do echo "OP write_opt: $write_opt 4M, \ -chattr_opt: $chattr_opt" +chattr_opt: $chattr_opt" >>$seq.full dd if=/dev/zero of=$SCRATCH_MNT/file.$idx \ bs=1M count=4 $write_opt \ >> $seq.full 2>&1 || exit @@ -69,7 +72,7 @@ chattr_opt: $chattr_opt" do echo "OP write_opt: $write_opt ENOSPC, \ -chattr_opt: $chattr_opt" +chattr_opt: $chattr_opt" >>$seq.full dd if=/dev/zero of=$SCRATCH_MNT/file.$idx \ bs=1M $write_opt >> $seq.full 2>&1 chattr $chattr_opt $SCRATCH_MNT/file.$idx \ diff --git a/272.out b/272.out index cc687aa..a9eaf84 100644 --- a/272.out +++ b/272.out @@ -1,37 +1,3 @@ QA output created by 272 - - Switch data journalling mode - -OP write_opt: iflag=noatime 4M, chattr_opt: +j -OP write_opt: iflag=noatime 4M, chattr_opt: -j -OP write_opt: iflag=noatime 4M, chattr_opt: +jS -OP write_opt: iflag=noatime 4M, chattr_opt: -j -OP write_opt: conv=notrunc 4M, chattr_opt: +j -OP write_opt: conv=notrunc 4M, chattr_opt: -j -OP write_opt: conv=notrunc 4M, chattr_opt: +jS -OP write_opt: conv=notrunc 4M, chattr_opt: -j -OP write_opt: conv=fsync 4M, chattr_opt: +j -OP write_opt: conv=fsync 4M, chattr_opt: -j -OP write_opt: conv=fsync 4M, chattr_opt: +jS -OP write_opt: conv=fsync 4M, chattr_opt: -j -OP write_opt: oflag=direct 4M, chattr_opt: +j -OP write_opt: oflag=direct 4M, chattr_opt: -j -OP write_opt: oflag=direct 4M, chattr_opt: +jS -OP write_opt: oflag=direct 4M, chattr_opt: -j -OP write_opt: iflag=noatime ENOSPC, chattr_opt: +j -OP write_opt: iflag=noatime ENOSPC, chattr_opt: -j -OP write_opt: iflag=noatime ENOSPC, chattr_opt: +jS -OP write_opt: iflag=noatime ENOSPC, chattr_opt: -j -OP write_opt: conv=notrunc ENOSPC, chattr_opt: +j -OP write_opt: conv=notrunc ENOSPC, chattr_opt: -j -OP write_opt: conv=notrunc ENOSPC, chattr_opt: +jS -OP write_opt: conv=notrunc ENOSPC, chattr_opt: -j -OP write_opt: conv=fsync ENOSPC, chattr_opt: +j -OP write_opt: conv=fsync ENOSPC, chattr_opt: -j -OP write_opt: conv=fsync ENOSPC, chattr_opt: +jS -OP write_opt: conv=fsync ENOSPC, chattr_opt: -j -OP write_opt: oflag=direct ENOSPC, chattr_opt: +j -OP write_opt: oflag=direct ENOSPC, chattr_opt: -j -OP write_opt: oflag=direct ENOSPC, chattr_opt: +jS -OP write_opt: oflag=direct ENOSPC, chattr_opt: -j +Switch data journalling mode. Silence is golden. Check filesystem -- 1.7.1 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: Test 272 fails for ext3 2012-08-20 21:06 ` Jan Kara @ 2012-08-20 22:49 ` Dave Chinner 2012-08-21 8:03 ` Jan Kara 0 siblings, 1 reply; 9+ messages in thread From: Dave Chinner @ 2012-08-20 22:49 UTC (permalink / raw) To: Jan Kara; +Cc: xfs, dmonakhov, linux-ext4 On Mon, Aug 20, 2012 at 11:06:38PM +0200, Jan Kara wrote: > On Mon 20-08-12 18:22:12, Jan Kara wrote: > > On Fri 17-08-12 08:48:58, Dave Chinner wrote: > > > On Thu, Aug 16, 2012 at 11:37:57AM +0200, Jan Kara wrote: > > > > Hello, > > > > > > > > I was looking into why test 272 from xfstests fails for ext3 and the > > > > reason is that ext3 does not support direct IO to file with enabled data > > > > journalling (open returns EINVAL because ->direct_IO callback is not > > > > specified). So I was thinking how to accomodate this fact in the test - > > > > the best I found was to just check using xfs_io whether O_DIRECT open > > > > succeeds and perform the test only in that case. Attached patch does this > > > > or do people have other ideas? > > > > > > > > > # ext3 doesn't support direct IO in journalling mode > > > ext3_write_opt_list="iflag=noatime conv=notrunc conv=fsync" > > > ext4_write_opt_list="iflag=noatime conv=notrunc conv=fsync oflag=direct" > > > > > > if [ $FSTYP = "ext3" ]; then > > > write_opt_list="$ext3_write_opt_list" > > > else > > > write_opt_list="$ext4_write_opt_list" > > > fi > > Yeah, this is probably simpler. Thanks for suggestion. BTW, ext4 also > > does not support direct IO and data journalling but it silently falls back > > to buffered IO. Anyway new patch is attached. > Hum, after testing this I realized why I did the things the original way. > The test writes a message with title for each test so when direct IO tests > are skipped outputs don't match. > > After some thought I decided to change the test to output titles only to > full output and keep compared output (almost) empty. Result is attached. .... > --- a/272 > +++ b/272 > @@ -32,15 +32,18 @@ tmp=/tmp/$$ > status=1 # failure is the default! > trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15 > > +write_opt_list="iflag=noatime conv=notrunc conv=fsync oflag=direct" > +if [ $FSTYP = "ext3" ]; then > + # ext3 doesn't support direct IO in journalling mode > + write_opt_list="iflag=noatime conv=notrunc conv=fsync" > +fi Seems like asking for trouble duplicating the common options. # ext3 doesn't support direct IO in journalling mode write_opt_list="iflag=noatime conv=notrunc conv=fsync [ $FSTYP = "ext4" ] && write_opt_list="$write_opt_list oflag=direct" Otherwise looks fine. Reviewed-by: Dave Chinner <dchinner@redhat.com> Cheers, Dave. -- Dave Chinner david@fromorbit.com ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: Test 272 fails for ext3 2012-08-20 22:49 ` Dave Chinner @ 2012-08-21 8:03 ` Jan Kara 2012-09-18 21:26 ` Ben Myers 0 siblings, 1 reply; 9+ messages in thread From: Jan Kara @ 2012-08-21 8:03 UTC (permalink / raw) To: Dave Chinner; +Cc: Jan Kara, xfs, dmonakhov, linux-ext4 [-- Attachment #1: Type: text/plain, Size: 965 bytes --] On Tue 21-08-12 08:49:41, Dave Chinner wrote: > On Mon, Aug 20, 2012 at 11:06:38PM +0200, Jan Kara wrote: > .... > > --- a/272 > > +++ b/272 > > @@ -32,15 +32,18 @@ tmp=/tmp/$$ > > status=1 # failure is the default! > > trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15 > > > > +write_opt_list="iflag=noatime conv=notrunc conv=fsync oflag=direct" > > +if [ $FSTYP = "ext3" ]; then > > + # ext3 doesn't support direct IO in journalling mode > > + write_opt_list="iflag=noatime conv=notrunc conv=fsync" > > +fi > > Seems like asking for trouble duplicating the common options. > > # ext3 doesn't support direct IO in journalling mode > write_opt_list="iflag=noatime conv=notrunc conv=fsync > [ $FSTYP = "ext4" ] && write_opt_list="$write_opt_list oflag=direct" > > Otherwise looks fine. > > Reviewed-by: Dave Chinner <dchinner@redhat.com> OK, I've updated the test as you suggested. Result is attached. Honza -- Jan Kara <jack@suse.cz> SUSE Labs, CR [-- Attachment #2: 0001-Make-test-272-work-for-ext3.patch --] [-- Type: text/x-patch, Size: 3793 bytes --] >From ffae802de298576f701a7cc0e0bfd2b33c6be36e Mon Sep 17 00:00:00 2001 From: Jan Kara <jack@suse.cz> Date: Thu, 16 Aug 2012 11:14:35 +0200 Subject: [PATCH v4] Make test 272 work for ext3 ext3 does not support direct IO for files with data journalling. This confuses test 272. Make the test check whether open succeeds and perform the writing only if it does. Thanks for Dave Chinner for suggesting a simpler way to fix the test. Reviewed-by: Dave Chinner <dchinner@redhat.com> Signed-off-by: Jan Kara <jack@suse.cz> --- 272 | 14 ++++++++------ 272.out | 36 +----------------------------------- 2 files changed, 9 insertions(+), 41 deletions(-) diff --git a/272 b/272 index 26dfa3b..c7f1efc 100755 --- a/272 +++ b/272 @@ -32,15 +32,17 @@ tmp=/tmp/$$ status=1 # failure is the default! trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15 +# ext3 doesn't support direct IO in journalling mode +write_opt_list="iflag=noatime conv=notrunc conv=fsync" +# For filesystems that can handle it, add also direct IO test +[ $FSTYP = "ext4" ] && write_opt_list="$write_opt_list oflag=direct" + # get standard environment, filters and checks . ./common.rc . ./common.filter _workout() { - echo "" - echo " Switch data journalling mode" - echo "" - write_opt_list="iflag=noatime conv=notrunc conv=fsync oflag=direct" + echo "Switch data journalling mode. Silence is golden." chattr_opt_list="+j -j +jS -j" idx=0 # @@ -51,7 +53,7 @@ _workout() do echo "OP write_opt: $write_opt 4M, \ -chattr_opt: $chattr_opt" +chattr_opt: $chattr_opt" >>$seq.full dd if=/dev/zero of=$SCRATCH_MNT/file.$idx \ bs=1M count=4 $write_opt \ >> $seq.full 2>&1 || exit @@ -69,7 +71,7 @@ chattr_opt: $chattr_opt" do echo "OP write_opt: $write_opt ENOSPC, \ -chattr_opt: $chattr_opt" +chattr_opt: $chattr_opt" >>$seq.full dd if=/dev/zero of=$SCRATCH_MNT/file.$idx \ bs=1M $write_opt >> $seq.full 2>&1 chattr $chattr_opt $SCRATCH_MNT/file.$idx \ diff --git a/272.out b/272.out index cc687aa..a9eaf84 100644 --- a/272.out +++ b/272.out @@ -1,37 +1,3 @@ QA output created by 272 - - Switch data journalling mode - -OP write_opt: iflag=noatime 4M, chattr_opt: +j -OP write_opt: iflag=noatime 4M, chattr_opt: -j -OP write_opt: iflag=noatime 4M, chattr_opt: +jS -OP write_opt: iflag=noatime 4M, chattr_opt: -j -OP write_opt: conv=notrunc 4M, chattr_opt: +j -OP write_opt: conv=notrunc 4M, chattr_opt: -j -OP write_opt: conv=notrunc 4M, chattr_opt: +jS -OP write_opt: conv=notrunc 4M, chattr_opt: -j -OP write_opt: conv=fsync 4M, chattr_opt: +j -OP write_opt: conv=fsync 4M, chattr_opt: -j -OP write_opt: conv=fsync 4M, chattr_opt: +jS -OP write_opt: conv=fsync 4M, chattr_opt: -j -OP write_opt: oflag=direct 4M, chattr_opt: +j -OP write_opt: oflag=direct 4M, chattr_opt: -j -OP write_opt: oflag=direct 4M, chattr_opt: +jS -OP write_opt: oflag=direct 4M, chattr_opt: -j -OP write_opt: iflag=noatime ENOSPC, chattr_opt: +j -OP write_opt: iflag=noatime ENOSPC, chattr_opt: -j -OP write_opt: iflag=noatime ENOSPC, chattr_opt: +jS -OP write_opt: iflag=noatime ENOSPC, chattr_opt: -j -OP write_opt: conv=notrunc ENOSPC, chattr_opt: +j -OP write_opt: conv=notrunc ENOSPC, chattr_opt: -j -OP write_opt: conv=notrunc ENOSPC, chattr_opt: +jS -OP write_opt: conv=notrunc ENOSPC, chattr_opt: -j -OP write_opt: conv=fsync ENOSPC, chattr_opt: +j -OP write_opt: conv=fsync ENOSPC, chattr_opt: -j -OP write_opt: conv=fsync ENOSPC, chattr_opt: +jS -OP write_opt: conv=fsync ENOSPC, chattr_opt: -j -OP write_opt: oflag=direct ENOSPC, chattr_opt: +j -OP write_opt: oflag=direct ENOSPC, chattr_opt: -j -OP write_opt: oflag=direct ENOSPC, chattr_opt: +jS -OP write_opt: oflag=direct ENOSPC, chattr_opt: -j +Switch data journalling mode. Silence is golden. Check filesystem -- 1.7.1 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: Test 272 fails for ext3 2012-08-21 8:03 ` Jan Kara @ 2012-09-18 21:26 ` Ben Myers 0 siblings, 0 replies; 9+ messages in thread From: Ben Myers @ 2012-09-18 21:26 UTC (permalink / raw) To: Jan Kara; +Cc: Dave Chinner, linux-ext4, dmonakhov, xfs On Tue, Aug 21, 2012 at 10:03:39AM +0200, Jan Kara wrote: > On Tue 21-08-12 08:49:41, Dave Chinner wrote: > > On Mon, Aug 20, 2012 at 11:06:38PM +0200, Jan Kara wrote: > > .... > > > --- a/272 > > > +++ b/272 > > > @@ -32,15 +32,18 @@ tmp=/tmp/$$ > > > status=1 # failure is the default! > > > trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15 > > > > > > +write_opt_list="iflag=noatime conv=notrunc conv=fsync oflag=direct" > > > +if [ $FSTYP = "ext3" ]; then > > > + # ext3 doesn't support direct IO in journalling mode > > > + write_opt_list="iflag=noatime conv=notrunc conv=fsync" > > > +fi > > > > Seems like asking for trouble duplicating the common options. > > > > # ext3 doesn't support direct IO in journalling mode > > write_opt_list="iflag=noatime conv=notrunc conv=fsync > > [ $FSTYP = "ext4" ] && write_opt_list="$write_opt_list oflag=direct" > > > > Otherwise looks fine. > > > > Reviewed-by: Dave Chinner <dchinner@redhat.com> > OK, I've updated the test as you suggested. Result is attached. Committed to git://oss.sgi.com/xfs/cmds/xfstests.git, master branch. ^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2012-09-18 21:26 UTC | newest] Thread overview: 9+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2012-08-16 9:28 Test 272 fails for ext3 Jan Kara 2012-08-16 9:37 ` Jan Kara 2012-08-16 10:07 ` Dmitry Monakhov 2012-08-16 22:48 ` Dave Chinner 2012-08-20 16:22 ` Jan Kara 2012-08-20 21:06 ` Jan Kara 2012-08-20 22:49 ` Dave Chinner 2012-08-21 8:03 ` Jan Kara 2012-09-18 21:26 ` Ben Myers
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).