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@xxxxxxxxxx>
OK, I've updated the test as you suggested. Result is attached.
Honza
--
Jan Kara <jack@xxxxxxx>
SUSE Labs, CR
>From ffae802de298576f701a7cc0e0bfd2b33c6be36e Mon Sep 17 00:00:00 2001
From: Jan Kara <jack@xxxxxxx>
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@xxxxxxxxxx>
Signed-off-by: Jan Kara <jack@xxxxxxx>
---
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
_______________________________________________
xfs mailing list
xfs@xxxxxxxxxxx
http://oss.sgi.com/mailman/listinfo/xfs
