[patch] xfsqa - 166 - fix filter for stripe aligned filesystems

[patch] xfsqa - 166 - fix filter for stripe aligned filesystems

[David Chinner]

Flags has extra bits set in it xfs_bmap output when
the filesyste is using stripe alignment. Fix the test
to only look at the unwritten flag. Capture the xfs_bmap
output as well so failures can be debugged easily.

Signed-off-by: Dave Chinner <dgc@sgi.com>
---
 xfstests/166 |   17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

Index: xfs-cmds/xfstests/166
===================================================================
--- xfs-cmds.orig/xfstests/166	2008-03-25 15:29:35.000000000 +1100
+++ xfs-cmds/xfstests/166	2008-04-11 13:33:31.220068950 +1000
@@ -17,6 +17,7 @@ here=`pwd`
 tmp=/tmp/$$
 status=1    # failure is the default!
 trap "_cleanup; exit \$status" 0 1 2 3 15
+rm $seq.full
 
 _cleanup()
 {
@@ -39,9 +40,14 @@ _filter_blocks()
 		unwritten2 = ((1048576/512) / 2) - 2 * written_size
 	}
 
-	if ($7) {
-		size = "RIGHT"
-		flags = "GOOD"
+	/* is the extent unwritten? */
+	unwritten_ext = 0;
+	if ($7 >= 10000)
+		unwritten_ext = 1;
+
+	size = "RIGHT"
+	flags = "GOOD"
+	if (unwritten_ext) {
 		if (unwritten1) {
 			if ($6 != unwritten1)
 				size = "WRONG"
@@ -49,11 +55,7 @@ _filter_blocks()
 		} else if ($6 != unwritten2) {
 			size = "WRONG"
 		}
-		if ($7 < 10000)
-			flags = "BAD"
 	} else {
-		size = "RIGHT"
-		flags = "GOOD"
 		if ($6 != written_size)
 			size = "WRONG"
 	}
@@ -77,6 +79,7 @@ FILE_SIZE=1048576
 rm -f $TEST_FILE
 $TEST_PROG $FILE_SIZE $TEST_FILE
 
+xfs_bmap -vp $TEST_FILE >> $seq.full
 xfs_bmap -vp $TEST_FILE | _filter_blocks
 
 status=0

Re: [patch] xfsqa - 166 - fix filter for stripe aligned filesystems

[Niv Sardi]

Looks good, one minor comment.

David Chinner <dgc@sgi.com> writes:

> Flags has extra bits set in it xfs_bmap output when
> the filesyste is using stripe alignment. Fix the test
> to only look at the unwritten flag. Capture the xfs_bmap
> output as well so failures can be debugged easily.
>
> Signed-off-by: Dave Chinner <dgc@sgi.com>
> ---
>  xfstests/166 |   17 ++++++++++-------
>  1 file changed, 10 insertions(+), 7 deletions(-)
>
> Index: xfs-cmds/xfstests/166
> ===================================================================
> --- xfs-cmds.orig/xfstests/166	2008-03-25 15:29:35.000000000 +1100
> +++ xfs-cmds/xfstests/166	2008-04-11 13:33:31.220068950 +1000
> @@ -17,6 +17,7 @@ here=`pwd`
>  tmp=/tmp/$$
>  status=1    # failure is the default!
>  trap "_cleanup; exit \$status" 0 1 2 3 15
> +rm $seq.full

rm -f ? so that it doesn't complain when file is not there ?
  
>  _cleanup()
>  {
> @@ -39,9 +40,14 @@ _filter_blocks()
>  		unwritten2 = ((1048576/512) / 2) - 2 * written_size
>  	}
>  
> -	if ($7) {
> -		size = "RIGHT"
> -		flags = "GOOD"
> +	/* is the extent unwritten? */
> +	unwritten_ext = 0;
> +	if ($7 >= 10000)
> +		unwritten_ext = 1;
> +
> +	size = "RIGHT"
> +	flags = "GOOD"
> +	if (unwritten_ext) {
>  		if (unwritten1) {
>  			if ($6 != unwritten1)
>  				size = "WRONG"
> @@ -49,11 +55,7 @@ _filter_blocks()
>  		} else if ($6 != unwritten2) {
>  			size = "WRONG"
>  		}
> -		if ($7 < 10000)
> -			flags = "BAD"
>  	} else {
> -		size = "RIGHT"
> -		flags = "GOOD"
>  		if ($6 != written_size)
>  			size = "WRONG"
>  	}
> @@ -77,6 +79,7 @@ FILE_SIZE=1048576
>  rm -f $TEST_FILE
>  $TEST_PROG $FILE_SIZE $TEST_FILE
>  
> +xfs_bmap -vp $TEST_FILE >> $seq.full
>  xfs_bmap -vp $TEST_FILE | _filter_blocks
>  
>  status=0

-- 
Niv Sardi

Re: [patch] xfsqa - 166 - fix filter for stripe aligned filesystems

[Eric Sandeen]

Niv Sardi wrote:
> Looks good, one minor comment.
> 
> David Chinner <dgc@sgi.com> writes:
> 
>> Flags has extra bits set in it xfs_bmap output when
>> the filesyste is using stripe alignment. Fix the test
>> to only look at the unwritten flag. Capture the xfs_bmap
>> output as well so failures can be debugged easily.
>>
>> Signed-off-by: Dave Chinner <dgc@sgi.com>
>> ---
>>  xfstests/166 |   17 ++++++++++-------
>>  1 file changed, 10 insertions(+), 7 deletions(-)
>>
>> Index: xfs-cmds/xfstests/166
>> ===================================================================
>> --- xfs-cmds.orig/xfstests/166	2008-03-25 15:29:35.000000000 +1100
>> +++ xfs-cmds/xfstests/166	2008-04-11 13:33:31.220068950 +1000
>> @@ -17,6 +17,7 @@ here=`pwd`
>>  tmp=/tmp/$$
>>  status=1    # failure is the default!
>>  trap "_cleanup; exit \$status" 0 1 2 3 15
>> +rm $seq.full
> 
> rm -f ? so that it doesn't complain when file is not there ?

All other tests do use rm -f here, it seems.

-Eric