diff mbox

[1/3] xfs/263: don't hardcode inode numbers in output

Message ID 148562509264.30594.7506967863745489318.stgit@birch.djwong.org (mailing list archive)
State New, archived
Headers show

Commit Message

Darrick J. Wong Jan. 28, 2017, 5:38 p.m. UTC 
From: Darrick J. Wong <darrick.wong@oracle.com>

Since we can't control the inode number assignments when creating files,
don't hardcode them in the golden output.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
---
 tests/xfs/263     |    6 +++++-
 tests/xfs/263.out |   52 ++++++++++++++++++++++++++--------------------------
 2 files changed, 31 insertions(+), 27 deletions(-)



--
To unsubscribe from this list: send the line "unsubscribe fstests" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Eric Sandeen Jan. 28, 2017, 6:10 p.m. UTC | #1 
On 1/28/17 11:38 AM, Darrick J. Wong wrote:
> From: Darrick J. Wong <darrick.wong@oracle.com>
> 
> Since we can't control the inode number assignments when creating files,
> don't hardcode them in the golden output.

what numbers are you seeing?

The inode numbers aren't important for the test, but I don't want to
gloss over something unexpected.

# Control size to control inode numbers
$MKFS_XFS_PROG -f -m crc=0 -n ftype=0 -d size=512m $SCRATCH_DEV >>$seqres.full

-Eric

 
> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
> ---
>  tests/xfs/263     |    6 +++++-
>  tests/xfs/263.out |   52 ++++++++++++++++++++++++++--------------------------
>  2 files changed, 31 insertions(+), 27 deletions(-)
> 
> 
> diff --git a/tests/xfs/263 b/tests/xfs/263
> index 1dc47ae..7aebf90 100755
> --- a/tests/xfs/263
> +++ b/tests/xfs/263
> @@ -71,6 +71,10 @@ function option_string()
>  	echo $OPT
>  }
>  
> +filter_quota_state() {
> +	sed -e 's/Inode: #[0-9]\+/Inode #XXX/g' | _filter_scratch
> +}
> +
>  function test_all_state()
>  {
>  	for I in `seq 0 7`; do
> @@ -79,7 +83,7 @@ function test_all_state()
>  		# Some combinations won't mount on V4 supers (grp + prj)
>  		_qmount_option "$OPTIONS"
>  		_scratch_mount &>> $seqres.full || continue
> -		$XFS_QUOTA_PROG -x -c "state" $SCRATCH_MNT | _filter_scratch
> +		$XFS_QUOTA_PROG -x -c "state" $SCRATCH_MNT | filter_quota_state
>  		_scratch_unmount
>  	done
>  }
> diff --git a/tests/xfs/263.out b/tests/xfs/263.out
> index 70454dd..531d45d 100644
> --- a/tests/xfs/263.out
> +++ b/tests/xfs/263.out
> @@ -5,7 +5,7 @@ QA output created by 263
>  User quota state on SCRATCH_MNT (SCRATCH_DEV)
>    Accounting: ON
>    Enforcement: ON
> -  Inode: #131 (1 blocks, 1 extents)
> +  Inode #XXX (1 blocks, 1 extents)
>  Group quota state on SCRATCH_MNT (SCRATCH_DEV)
>    Accounting: OFF
>    Enforcement: OFF
> @@ -21,11 +21,11 @@ Realtime Blocks grace time: [7 days]
>  User quota state on SCRATCH_MNT (SCRATCH_DEV)
>    Accounting: OFF
>    Enforcement: OFF
> -  Inode: #131 (1 blocks, 1 extents)
> +  Inode #XXX (1 blocks, 1 extents)
>  Group quota state on SCRATCH_MNT (SCRATCH_DEV)
>    Accounting: ON
>    Enforcement: ON
> -  Inode: #132 (1 blocks, 1 extents)
> +  Inode #XXX (1 blocks, 1 extents)
>  Project quota state on SCRATCH_MNT (SCRATCH_DEV)
>    Accounting: OFF
>    Enforcement: OFF
> @@ -37,11 +37,11 @@ Realtime Blocks grace time: [7 days]
>  User quota state on SCRATCH_MNT (SCRATCH_DEV)
>    Accounting: ON
>    Enforcement: ON
> -  Inode: #131 (1 blocks, 1 extents)
> +  Inode #XXX (1 blocks, 1 extents)
>  Group quota state on SCRATCH_MNT (SCRATCH_DEV)
>    Accounting: ON
>    Enforcement: ON
> -  Inode: #132 (1 blocks, 1 extents)
> +  Inode #XXX (1 blocks, 1 extents)
>  Project quota state on SCRATCH_MNT (SCRATCH_DEV)
>    Accounting: OFF
>    Enforcement: OFF
> @@ -53,7 +53,7 @@ Realtime Blocks grace time: [7 days]
>  User quota state on SCRATCH_MNT (SCRATCH_DEV)
>    Accounting: OFF
>    Enforcement: OFF
> -  Inode: #131 (1 blocks, 1 extents)
> +  Inode #XXX (1 blocks, 1 extents)
>  Group quota state on SCRATCH_MNT (SCRATCH_DEV)
>    Accounting: OFF
>    Enforcement: OFF
> @@ -61,7 +61,7 @@ Group quota state on SCRATCH_MNT (SCRATCH_DEV)
>  Project quota state on SCRATCH_MNT (SCRATCH_DEV)
>    Accounting: ON
>    Enforcement: ON
> -  Inode: #132 (1 blocks, 1 extents)
> +  Inode #XXX (1 blocks, 1 extents)
>  Blocks grace time: [7 days]
>  Inodes grace time: [7 days]
>  Realtime Blocks grace time: [7 days]
> @@ -69,7 +69,7 @@ Realtime Blocks grace time: [7 days]
>  User quota state on SCRATCH_MNT (SCRATCH_DEV)
>    Accounting: ON
>    Enforcement: ON
> -  Inode: #131 (1 blocks, 1 extents)
> +  Inode #XXX (1 blocks, 1 extents)
>  Group quota state on SCRATCH_MNT (SCRATCH_DEV)
>    Accounting: OFF
>    Enforcement: OFF
> @@ -77,7 +77,7 @@ Group quota state on SCRATCH_MNT (SCRATCH_DEV)
>  Project quota state on SCRATCH_MNT (SCRATCH_DEV)
>    Accounting: ON
>    Enforcement: ON
> -  Inode: #132 (1 blocks, 1 extents)
> +  Inode #XXX (1 blocks, 1 extents)
>  Blocks grace time: [7 days]
>  Inodes grace time: [7 days]
>  Realtime Blocks grace time: [7 days]
> @@ -89,7 +89,7 @@ Realtime Blocks grace time: [7 days]
>  User quota state on SCRATCH_MNT (SCRATCH_DEV)
>    Accounting: ON
>    Enforcement: ON
> -  Inode: #99 (1 blocks, 1 extents)
> +  Inode #XXX (1 blocks, 1 extents)
>  Group quota state on SCRATCH_MNT (SCRATCH_DEV)
>    Accounting: OFF
>    Enforcement: OFF
> @@ -105,11 +105,11 @@ Realtime Blocks grace time: [7 days]
>  User quota state on SCRATCH_MNT (SCRATCH_DEV)
>    Accounting: OFF
>    Enforcement: OFF
> -  Inode: #99 (1 blocks, 1 extents)
> +  Inode #XXX (1 blocks, 1 extents)
>  Group quota state on SCRATCH_MNT (SCRATCH_DEV)
>    Accounting: ON
>    Enforcement: ON
> -  Inode: #100 (1 blocks, 1 extents)
> +  Inode #XXX (1 blocks, 1 extents)
>  Project quota state on SCRATCH_MNT (SCRATCH_DEV)
>    Accounting: OFF
>    Enforcement: OFF
> @@ -121,11 +121,11 @@ Realtime Blocks grace time: [7 days]
>  User quota state on SCRATCH_MNT (SCRATCH_DEV)
>    Accounting: ON
>    Enforcement: ON
> -  Inode: #99 (1 blocks, 1 extents)
> +  Inode #XXX (1 blocks, 1 extents)
>  Group quota state on SCRATCH_MNT (SCRATCH_DEV)
>    Accounting: ON
>    Enforcement: ON
> -  Inode: #100 (1 blocks, 1 extents)
> +  Inode #XXX (1 blocks, 1 extents)
>  Project quota state on SCRATCH_MNT (SCRATCH_DEV)
>    Accounting: OFF
>    Enforcement: OFF
> @@ -137,15 +137,15 @@ Realtime Blocks grace time: [7 days]
>  User quota state on SCRATCH_MNT (SCRATCH_DEV)
>    Accounting: OFF
>    Enforcement: OFF
> -  Inode: #99 (1 blocks, 1 extents)
> +  Inode #XXX (1 blocks, 1 extents)
>  Group quota state on SCRATCH_MNT (SCRATCH_DEV)
>    Accounting: OFF
>    Enforcement: OFF
> -  Inode: #100 (1 blocks, 1 extents)
> +  Inode #XXX (1 blocks, 1 extents)
>  Project quota state on SCRATCH_MNT (SCRATCH_DEV)
>    Accounting: ON
>    Enforcement: ON
> -  Inode: #101 (1 blocks, 1 extents)
> +  Inode #XXX (1 blocks, 1 extents)
>  Blocks grace time: [7 days]
>  Inodes grace time: [7 days]
>  Realtime Blocks grace time: [7 days]
> @@ -153,15 +153,15 @@ Realtime Blocks grace time: [7 days]
>  User quota state on SCRATCH_MNT (SCRATCH_DEV)
>    Accounting: ON
>    Enforcement: ON
> -  Inode: #99 (1 blocks, 1 extents)
> +  Inode #XXX (1 blocks, 1 extents)
>  Group quota state on SCRATCH_MNT (SCRATCH_DEV)
>    Accounting: OFF
>    Enforcement: OFF
> -  Inode: #100 (1 blocks, 1 extents)
> +  Inode #XXX (1 blocks, 1 extents)
>  Project quota state on SCRATCH_MNT (SCRATCH_DEV)
>    Accounting: ON
>    Enforcement: ON
> -  Inode: #101 (1 blocks, 1 extents)
> +  Inode #XXX (1 blocks, 1 extents)
>  Blocks grace time: [7 days]
>  Inodes grace time: [7 days]
>  Realtime Blocks grace time: [7 days]
> @@ -169,15 +169,15 @@ Realtime Blocks grace time: [7 days]
>  User quota state on SCRATCH_MNT (SCRATCH_DEV)
>    Accounting: OFF
>    Enforcement: OFF
> -  Inode: #99 (1 blocks, 1 extents)
> +  Inode #XXX (1 blocks, 1 extents)
>  Group quota state on SCRATCH_MNT (SCRATCH_DEV)
>    Accounting: ON
>    Enforcement: ON
> -  Inode: #100 (1 blocks, 1 extents)
> +  Inode #XXX (1 blocks, 1 extents)
>  Project quota state on SCRATCH_MNT (SCRATCH_DEV)
>    Accounting: ON
>    Enforcement: ON
> -  Inode: #101 (1 blocks, 1 extents)
> +  Inode #XXX (1 blocks, 1 extents)
>  Blocks grace time: [7 days]
>  Inodes grace time: [7 days]
>  Realtime Blocks grace time: [7 days]
> @@ -185,15 +185,15 @@ Realtime Blocks grace time: [7 days]
>  User quota state on SCRATCH_MNT (SCRATCH_DEV)
>    Accounting: ON
>    Enforcement: ON
> -  Inode: #99 (1 blocks, 1 extents)
> +  Inode #XXX (1 blocks, 1 extents)
>  Group quota state on SCRATCH_MNT (SCRATCH_DEV)
>    Accounting: ON
>    Enforcement: ON
> -  Inode: #100 (1 blocks, 1 extents)
> +  Inode #XXX (1 blocks, 1 extents)
>  Project quota state on SCRATCH_MNT (SCRATCH_DEV)
>    Accounting: ON
>    Enforcement: ON
> -  Inode: #101 (1 blocks, 1 extents)
> +  Inode #XXX (1 blocks, 1 extents)
>  Blocks grace time: [7 days]
>  Inodes grace time: [7 days]
>  Realtime Blocks grace time: [7 days]
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 
--
To unsubscribe from this list: send the line "unsubscribe fstests" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Darrick J. Wong Jan. 28, 2017, 8:30 p.m. UTC | #2 
On Sat, Jan 28, 2017 at 12:10:56PM -0600, Eric Sandeen wrote:
> On 1/28/17 11:38 AM, Darrick J. Wong wrote:
> > From: Darrick J. Wong <darrick.wong@oracle.com>
> > 
> > Since we can't control the inode number assignments when creating files,
> > don't hardcode them in the golden output.
> 
> what numbers are you seeing?
> 
> The inode numbers aren't important for the test, but I don't want to
> gloss over something unexpected.

I consistently see 131+64 = 195 and things like that.

--D

> # Control size to control inode numbers
> $MKFS_XFS_PROG -f -m crc=0 -n ftype=0 -d size=512m $SCRATCH_DEV >>$seqres.full
> 
> -Eric
> 
>  
> > Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
> > ---
> >  tests/xfs/263     |    6 +++++-
> >  tests/xfs/263.out |   52 ++++++++++++++++++++++++++--------------------------
> >  2 files changed, 31 insertions(+), 27 deletions(-)
> > 
> > 
> > diff --git a/tests/xfs/263 b/tests/xfs/263
> > index 1dc47ae..7aebf90 100755
> > --- a/tests/xfs/263
> > +++ b/tests/xfs/263
> > @@ -71,6 +71,10 @@ function option_string()
> >  	echo $OPT
> >  }
> >  
> > +filter_quota_state() {
> > +	sed -e 's/Inode: #[0-9]\+/Inode #XXX/g' | _filter_scratch
> > +}
> > +
> >  function test_all_state()
> >  {
> >  	for I in `seq 0 7`; do
> > @@ -79,7 +83,7 @@ function test_all_state()
> >  		# Some combinations won't mount on V4 supers (grp + prj)
> >  		_qmount_option "$OPTIONS"
> >  		_scratch_mount &>> $seqres.full || continue
> > -		$XFS_QUOTA_PROG -x -c "state" $SCRATCH_MNT | _filter_scratch
> > +		$XFS_QUOTA_PROG -x -c "state" $SCRATCH_MNT | filter_quota_state
> >  		_scratch_unmount
> >  	done
> >  }
> > diff --git a/tests/xfs/263.out b/tests/xfs/263.out
> > index 70454dd..531d45d 100644
> > --- a/tests/xfs/263.out
> > +++ b/tests/xfs/263.out
> > @@ -5,7 +5,7 @@ QA output created by 263
> >  User quota state on SCRATCH_MNT (SCRATCH_DEV)
> >    Accounting: ON
> >    Enforcement: ON
> > -  Inode: #131 (1 blocks, 1 extents)
> > +  Inode #XXX (1 blocks, 1 extents)
> >  Group quota state on SCRATCH_MNT (SCRATCH_DEV)
> >    Accounting: OFF
> >    Enforcement: OFF
> > @@ -21,11 +21,11 @@ Realtime Blocks grace time: [7 days]
> >  User quota state on SCRATCH_MNT (SCRATCH_DEV)
> >    Accounting: OFF
> >    Enforcement: OFF
> > -  Inode: #131 (1 blocks, 1 extents)
> > +  Inode #XXX (1 blocks, 1 extents)
> >  Group quota state on SCRATCH_MNT (SCRATCH_DEV)
> >    Accounting: ON
> >    Enforcement: ON
> > -  Inode: #132 (1 blocks, 1 extents)
> > +  Inode #XXX (1 blocks, 1 extents)
> >  Project quota state on SCRATCH_MNT (SCRATCH_DEV)
> >    Accounting: OFF
> >    Enforcement: OFF
> > @@ -37,11 +37,11 @@ Realtime Blocks grace time: [7 days]
> >  User quota state on SCRATCH_MNT (SCRATCH_DEV)
> >    Accounting: ON
> >    Enforcement: ON
> > -  Inode: #131 (1 blocks, 1 extents)
> > +  Inode #XXX (1 blocks, 1 extents)
> >  Group quota state on SCRATCH_MNT (SCRATCH_DEV)
> >    Accounting: ON
> >    Enforcement: ON
> > -  Inode: #132 (1 blocks, 1 extents)
> > +  Inode #XXX (1 blocks, 1 extents)
> >  Project quota state on SCRATCH_MNT (SCRATCH_DEV)
> >    Accounting: OFF
> >    Enforcement: OFF
> > @@ -53,7 +53,7 @@ Realtime Blocks grace time: [7 days]
> >  User quota state on SCRATCH_MNT (SCRATCH_DEV)
> >    Accounting: OFF
> >    Enforcement: OFF
> > -  Inode: #131 (1 blocks, 1 extents)
> > +  Inode #XXX (1 blocks, 1 extents)
> >  Group quota state on SCRATCH_MNT (SCRATCH_DEV)
> >    Accounting: OFF
> >    Enforcement: OFF
> > @@ -61,7 +61,7 @@ Group quota state on SCRATCH_MNT (SCRATCH_DEV)
> >  Project quota state on SCRATCH_MNT (SCRATCH_DEV)
> >    Accounting: ON
> >    Enforcement: ON
> > -  Inode: #132 (1 blocks, 1 extents)
> > +  Inode #XXX (1 blocks, 1 extents)
> >  Blocks grace time: [7 days]
> >  Inodes grace time: [7 days]
> >  Realtime Blocks grace time: [7 days]
> > @@ -69,7 +69,7 @@ Realtime Blocks grace time: [7 days]
> >  User quota state on SCRATCH_MNT (SCRATCH_DEV)
> >    Accounting: ON
> >    Enforcement: ON
> > -  Inode: #131 (1 blocks, 1 extents)
> > +  Inode #XXX (1 blocks, 1 extents)
> >  Group quota state on SCRATCH_MNT (SCRATCH_DEV)
> >    Accounting: OFF
> >    Enforcement: OFF
> > @@ -77,7 +77,7 @@ Group quota state on SCRATCH_MNT (SCRATCH_DEV)
> >  Project quota state on SCRATCH_MNT (SCRATCH_DEV)
> >    Accounting: ON
> >    Enforcement: ON
> > -  Inode: #132 (1 blocks, 1 extents)
> > +  Inode #XXX (1 blocks, 1 extents)
> >  Blocks grace time: [7 days]
> >  Inodes grace time: [7 days]
> >  Realtime Blocks grace time: [7 days]
> > @@ -89,7 +89,7 @@ Realtime Blocks grace time: [7 days]
> >  User quota state on SCRATCH_MNT (SCRATCH_DEV)
> >    Accounting: ON
> >    Enforcement: ON
> > -  Inode: #99 (1 blocks, 1 extents)
> > +  Inode #XXX (1 blocks, 1 extents)
> >  Group quota state on SCRATCH_MNT (SCRATCH_DEV)
> >    Accounting: OFF
> >    Enforcement: OFF
> > @@ -105,11 +105,11 @@ Realtime Blocks grace time: [7 days]
> >  User quota state on SCRATCH_MNT (SCRATCH_DEV)
> >    Accounting: OFF
> >    Enforcement: OFF
> > -  Inode: #99 (1 blocks, 1 extents)
> > +  Inode #XXX (1 blocks, 1 extents)
> >  Group quota state on SCRATCH_MNT (SCRATCH_DEV)
> >    Accounting: ON
> >    Enforcement: ON
> > -  Inode: #100 (1 blocks, 1 extents)
> > +  Inode #XXX (1 blocks, 1 extents)
> >  Project quota state on SCRATCH_MNT (SCRATCH_DEV)
> >    Accounting: OFF
> >    Enforcement: OFF
> > @@ -121,11 +121,11 @@ Realtime Blocks grace time: [7 days]
> >  User quota state on SCRATCH_MNT (SCRATCH_DEV)
> >    Accounting: ON
> >    Enforcement: ON
> > -  Inode: #99 (1 blocks, 1 extents)
> > +  Inode #XXX (1 blocks, 1 extents)
> >  Group quota state on SCRATCH_MNT (SCRATCH_DEV)
> >    Accounting: ON
> >    Enforcement: ON
> > -  Inode: #100 (1 blocks, 1 extents)
> > +  Inode #XXX (1 blocks, 1 extents)
> >  Project quota state on SCRATCH_MNT (SCRATCH_DEV)
> >    Accounting: OFF
> >    Enforcement: OFF
> > @@ -137,15 +137,15 @@ Realtime Blocks grace time: [7 days]
> >  User quota state on SCRATCH_MNT (SCRATCH_DEV)
> >    Accounting: OFF
> >    Enforcement: OFF
> > -  Inode: #99 (1 blocks, 1 extents)
> > +  Inode #XXX (1 blocks, 1 extents)
> >  Group quota state on SCRATCH_MNT (SCRATCH_DEV)
> >    Accounting: OFF
> >    Enforcement: OFF
> > -  Inode: #100 (1 blocks, 1 extents)
> > +  Inode #XXX (1 blocks, 1 extents)
> >  Project quota state on SCRATCH_MNT (SCRATCH_DEV)
> >    Accounting: ON
> >    Enforcement: ON
> > -  Inode: #101 (1 blocks, 1 extents)
> > +  Inode #XXX (1 blocks, 1 extents)
> >  Blocks grace time: [7 days]
> >  Inodes grace time: [7 days]
> >  Realtime Blocks grace time: [7 days]
> > @@ -153,15 +153,15 @@ Realtime Blocks grace time: [7 days]
> >  User quota state on SCRATCH_MNT (SCRATCH_DEV)
> >    Accounting: ON
> >    Enforcement: ON
> > -  Inode: #99 (1 blocks, 1 extents)
> > +  Inode #XXX (1 blocks, 1 extents)
> >  Group quota state on SCRATCH_MNT (SCRATCH_DEV)
> >    Accounting: OFF
> >    Enforcement: OFF
> > -  Inode: #100 (1 blocks, 1 extents)
> > +  Inode #XXX (1 blocks, 1 extents)
> >  Project quota state on SCRATCH_MNT (SCRATCH_DEV)
> >    Accounting: ON
> >    Enforcement: ON
> > -  Inode: #101 (1 blocks, 1 extents)
> > +  Inode #XXX (1 blocks, 1 extents)
> >  Blocks grace time: [7 days]
> >  Inodes grace time: [7 days]
> >  Realtime Blocks grace time: [7 days]
> > @@ -169,15 +169,15 @@ Realtime Blocks grace time: [7 days]
> >  User quota state on SCRATCH_MNT (SCRATCH_DEV)
> >    Accounting: OFF
> >    Enforcement: OFF
> > -  Inode: #99 (1 blocks, 1 extents)
> > +  Inode #XXX (1 blocks, 1 extents)
> >  Group quota state on SCRATCH_MNT (SCRATCH_DEV)
> >    Accounting: ON
> >    Enforcement: ON
> > -  Inode: #100 (1 blocks, 1 extents)
> > +  Inode #XXX (1 blocks, 1 extents)
> >  Project quota state on SCRATCH_MNT (SCRATCH_DEV)
> >    Accounting: ON
> >    Enforcement: ON
> > -  Inode: #101 (1 blocks, 1 extents)
> > +  Inode #XXX (1 blocks, 1 extents)
> >  Blocks grace time: [7 days]
> >  Inodes grace time: [7 days]
> >  Realtime Blocks grace time: [7 days]
> > @@ -185,15 +185,15 @@ Realtime Blocks grace time: [7 days]
> >  User quota state on SCRATCH_MNT (SCRATCH_DEV)
> >    Accounting: ON
> >    Enforcement: ON
> > -  Inode: #99 (1 blocks, 1 extents)
> > +  Inode #XXX (1 blocks, 1 extents)
> >  Group quota state on SCRATCH_MNT (SCRATCH_DEV)
> >    Accounting: ON
> >    Enforcement: ON
> > -  Inode: #100 (1 blocks, 1 extents)
> > +  Inode #XXX (1 blocks, 1 extents)
> >  Project quota state on SCRATCH_MNT (SCRATCH_DEV)
> >    Accounting: ON
> >    Enforcement: ON
> > -  Inode: #101 (1 blocks, 1 extents)
> > +  Inode #XXX (1 blocks, 1 extents)
> >  Blocks grace time: [7 days]
> >  Inodes grace time: [7 days]
> >  Realtime Blocks grace time: [7 days]
> > 
> > --
> > To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
> > the body of a message to majordomo@vger.kernel.org
> > More majordomo info at  http://vger.kernel.org/majordomo-info.html
> > 
> --
> To unsubscribe from this list: send the line "unsubscribe fstests" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe fstests" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Eryu Guan Feb. 3, 2017, 6:42 a.m. UTC | #3 
On Sat, Jan 28, 2017 at 12:30:12PM -0800, Darrick J. Wong wrote:
> On Sat, Jan 28, 2017 at 12:10:56PM -0600, Eric Sandeen wrote:
> > On 1/28/17 11:38 AM, Darrick J. Wong wrote:
> > > From: Darrick J. Wong <darrick.wong@oracle.com>
> > > 
> > > Since we can't control the inode number assignments when creating files,
> > > don't hardcode them in the golden output.
> > 
> > what numbers are you seeing?
> > 
> > The inode numbers aren't important for the test, but I don't want to
> > gloss over something unexpected.
> 
> I consistently see 131+64 = 195 and things like that.

I occasionally see 195/6 inode numbers too, I suspect it has something
to do with 4k-sector disks. Test failed if I point SCRATCH_DEV to a
4k-sector scsi_debug device, and test passed after applying this patch.

Thanks,
Eryu
--
To unsubscribe from this list: send the line "unsubscribe fstests" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Darrick J. Wong Feb. 3, 2017, 5:46 p.m. UTC | #4 
On Fri, Feb 03, 2017 at 02:42:30PM +0800, Eryu Guan wrote:
> On Sat, Jan 28, 2017 at 12:30:12PM -0800, Darrick J. Wong wrote:
> > On Sat, Jan 28, 2017 at 12:10:56PM -0600, Eric Sandeen wrote:
> > > On 1/28/17 11:38 AM, Darrick J. Wong wrote:
> > > > From: Darrick J. Wong <darrick.wong@oracle.com>
> > > > 
> > > > Since we can't control the inode number assignments when creating files,
> > > > don't hardcode them in the golden output.
> > > 
> > > what numbers are you seeing?
> > > 
> > > The inode numbers aren't important for the test, but I don't want to
> > > gloss over something unexpected.
> > 
> > I consistently see 131+64 = 195 and things like that.
> 
> I occasionally see 195/6 inode numbers too, I suspect it has something
> to do with 4k-sector disks. Test failed if I point SCRATCH_DEV to a
> 4k-sector scsi_debug device, and test passed after applying this patch.

Aha!  I do have 4k-sector disks underlying the VMs that fail.  Yes,
that's the key.

--D

> 
> Thanks,
> Eryu
> --
> To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe fstests" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/tests/xfs/263 b/tests/xfs/263
index 1dc47ae..7aebf90 100755
--- a/tests/xfs/263
+++ b/tests/xfs/263
@@ -71,6 +71,10 @@  function option_string()
 	echo $OPT
 }
 
+filter_quota_state() {
+	sed -e 's/Inode: #[0-9]\+/Inode #XXX/g' | _filter_scratch
+}
+
 function test_all_state()
 {
 	for I in `seq 0 7`; do
@@ -79,7 +83,7 @@  function test_all_state()
 		# Some combinations won't mount on V4 supers (grp + prj)
 		_qmount_option "$OPTIONS"
 		_scratch_mount &>> $seqres.full || continue
-		$XFS_QUOTA_PROG -x -c "state" $SCRATCH_MNT | _filter_scratch
+		$XFS_QUOTA_PROG -x -c "state" $SCRATCH_MNT | filter_quota_state
 		_scratch_unmount
 	done
 }
diff --git a/tests/xfs/263.out b/tests/xfs/263.out
index 70454dd..531d45d 100644
--- a/tests/xfs/263.out
+++ b/tests/xfs/263.out
@@ -5,7 +5,7 @@  QA output created by 263
 User quota state on SCRATCH_MNT (SCRATCH_DEV)
   Accounting: ON
   Enforcement: ON
-  Inode: #131 (1 blocks, 1 extents)
+  Inode #XXX (1 blocks, 1 extents)
 Group quota state on SCRATCH_MNT (SCRATCH_DEV)
   Accounting: OFF
   Enforcement: OFF
@@ -21,11 +21,11 @@  Realtime Blocks grace time: [7 days]
 User quota state on SCRATCH_MNT (SCRATCH_DEV)
   Accounting: OFF
   Enforcement: OFF
-  Inode: #131 (1 blocks, 1 extents)
+  Inode #XXX (1 blocks, 1 extents)
 Group quota state on SCRATCH_MNT (SCRATCH_DEV)
   Accounting: ON
   Enforcement: ON
-  Inode: #132 (1 blocks, 1 extents)
+  Inode #XXX (1 blocks, 1 extents)
 Project quota state on SCRATCH_MNT (SCRATCH_DEV)
   Accounting: OFF
   Enforcement: OFF
@@ -37,11 +37,11 @@  Realtime Blocks grace time: [7 days]
 User quota state on SCRATCH_MNT (SCRATCH_DEV)
   Accounting: ON
   Enforcement: ON
-  Inode: #131 (1 blocks, 1 extents)
+  Inode #XXX (1 blocks, 1 extents)
 Group quota state on SCRATCH_MNT (SCRATCH_DEV)
   Accounting: ON
   Enforcement: ON
-  Inode: #132 (1 blocks, 1 extents)
+  Inode #XXX (1 blocks, 1 extents)
 Project quota state on SCRATCH_MNT (SCRATCH_DEV)
   Accounting: OFF
   Enforcement: OFF
@@ -53,7 +53,7 @@  Realtime Blocks grace time: [7 days]
 User quota state on SCRATCH_MNT (SCRATCH_DEV)
   Accounting: OFF
   Enforcement: OFF
-  Inode: #131 (1 blocks, 1 extents)
+  Inode #XXX (1 blocks, 1 extents)
 Group quota state on SCRATCH_MNT (SCRATCH_DEV)
   Accounting: OFF
   Enforcement: OFF
@@ -61,7 +61,7 @@  Group quota state on SCRATCH_MNT (SCRATCH_DEV)
 Project quota state on SCRATCH_MNT (SCRATCH_DEV)
   Accounting: ON
   Enforcement: ON
-  Inode: #132 (1 blocks, 1 extents)
+  Inode #XXX (1 blocks, 1 extents)
 Blocks grace time: [7 days]
 Inodes grace time: [7 days]
 Realtime Blocks grace time: [7 days]
@@ -69,7 +69,7 @@  Realtime Blocks grace time: [7 days]
 User quota state on SCRATCH_MNT (SCRATCH_DEV)
   Accounting: ON
   Enforcement: ON
-  Inode: #131 (1 blocks, 1 extents)
+  Inode #XXX (1 blocks, 1 extents)
 Group quota state on SCRATCH_MNT (SCRATCH_DEV)
   Accounting: OFF
   Enforcement: OFF
@@ -77,7 +77,7 @@  Group quota state on SCRATCH_MNT (SCRATCH_DEV)
 Project quota state on SCRATCH_MNT (SCRATCH_DEV)
   Accounting: ON
   Enforcement: ON
-  Inode: #132 (1 blocks, 1 extents)
+  Inode #XXX (1 blocks, 1 extents)
 Blocks grace time: [7 days]
 Inodes grace time: [7 days]
 Realtime Blocks grace time: [7 days]
@@ -89,7 +89,7 @@  Realtime Blocks grace time: [7 days]
 User quota state on SCRATCH_MNT (SCRATCH_DEV)
   Accounting: ON
   Enforcement: ON
-  Inode: #99 (1 blocks, 1 extents)
+  Inode #XXX (1 blocks, 1 extents)
 Group quota state on SCRATCH_MNT (SCRATCH_DEV)
   Accounting: OFF
   Enforcement: OFF
@@ -105,11 +105,11 @@  Realtime Blocks grace time: [7 days]
 User quota state on SCRATCH_MNT (SCRATCH_DEV)
   Accounting: OFF
   Enforcement: OFF
-  Inode: #99 (1 blocks, 1 extents)
+  Inode #XXX (1 blocks, 1 extents)
 Group quota state on SCRATCH_MNT (SCRATCH_DEV)
   Accounting: ON
   Enforcement: ON
-  Inode: #100 (1 blocks, 1 extents)
+  Inode #XXX (1 blocks, 1 extents)
 Project quota state on SCRATCH_MNT (SCRATCH_DEV)
   Accounting: OFF
   Enforcement: OFF
@@ -121,11 +121,11 @@  Realtime Blocks grace time: [7 days]
 User quota state on SCRATCH_MNT (SCRATCH_DEV)
   Accounting: ON
   Enforcement: ON
-  Inode: #99 (1 blocks, 1 extents)
+  Inode #XXX (1 blocks, 1 extents)
 Group quota state on SCRATCH_MNT (SCRATCH_DEV)
   Accounting: ON
   Enforcement: ON
-  Inode: #100 (1 blocks, 1 extents)
+  Inode #XXX (1 blocks, 1 extents)
 Project quota state on SCRATCH_MNT (SCRATCH_DEV)
   Accounting: OFF
   Enforcement: OFF
@@ -137,15 +137,15 @@  Realtime Blocks grace time: [7 days]
 User quota state on SCRATCH_MNT (SCRATCH_DEV)
   Accounting: OFF
   Enforcement: OFF
-  Inode: #99 (1 blocks, 1 extents)
+  Inode #XXX (1 blocks, 1 extents)
 Group quota state on SCRATCH_MNT (SCRATCH_DEV)
   Accounting: OFF
   Enforcement: OFF
-  Inode: #100 (1 blocks, 1 extents)
+  Inode #XXX (1 blocks, 1 extents)
 Project quota state on SCRATCH_MNT (SCRATCH_DEV)
   Accounting: ON
   Enforcement: ON
-  Inode: #101 (1 blocks, 1 extents)
+  Inode #XXX (1 blocks, 1 extents)
 Blocks grace time: [7 days]
 Inodes grace time: [7 days]
 Realtime Blocks grace time: [7 days]
@@ -153,15 +153,15 @@  Realtime Blocks grace time: [7 days]
 User quota state on SCRATCH_MNT (SCRATCH_DEV)
   Accounting: ON
   Enforcement: ON
-  Inode: #99 (1 blocks, 1 extents)
+  Inode #XXX (1 blocks, 1 extents)
 Group quota state on SCRATCH_MNT (SCRATCH_DEV)
   Accounting: OFF
   Enforcement: OFF
-  Inode: #100 (1 blocks, 1 extents)
+  Inode #XXX (1 blocks, 1 extents)
 Project quota state on SCRATCH_MNT (SCRATCH_DEV)
   Accounting: ON
   Enforcement: ON
-  Inode: #101 (1 blocks, 1 extents)
+  Inode #XXX (1 blocks, 1 extents)
 Blocks grace time: [7 days]
 Inodes grace time: [7 days]
 Realtime Blocks grace time: [7 days]
@@ -169,15 +169,15 @@  Realtime Blocks grace time: [7 days]
 User quota state on SCRATCH_MNT (SCRATCH_DEV)
   Accounting: OFF
   Enforcement: OFF
-  Inode: #99 (1 blocks, 1 extents)
+  Inode #XXX (1 blocks, 1 extents)
 Group quota state on SCRATCH_MNT (SCRATCH_DEV)
   Accounting: ON
   Enforcement: ON
-  Inode: #100 (1 blocks, 1 extents)
+  Inode #XXX (1 blocks, 1 extents)
 Project quota state on SCRATCH_MNT (SCRATCH_DEV)
   Accounting: ON
   Enforcement: ON
-  Inode: #101 (1 blocks, 1 extents)
+  Inode #XXX (1 blocks, 1 extents)
 Blocks grace time: [7 days]
 Inodes grace time: [7 days]
 Realtime Blocks grace time: [7 days]
@@ -185,15 +185,15 @@  Realtime Blocks grace time: [7 days]
 User quota state on SCRATCH_MNT (SCRATCH_DEV)
   Accounting: ON
   Enforcement: ON
-  Inode: #99 (1 blocks, 1 extents)
+  Inode #XXX (1 blocks, 1 extents)
 Group quota state on SCRATCH_MNT (SCRATCH_DEV)
   Accounting: ON
   Enforcement: ON
-  Inode: #100 (1 blocks, 1 extents)
+  Inode #XXX (1 blocks, 1 extents)
 Project quota state on SCRATCH_MNT (SCRATCH_DEV)
   Accounting: ON
   Enforcement: ON
-  Inode: #101 (1 blocks, 1 extents)
+  Inode #XXX (1 blocks, 1 extents)
 Blocks grace time: [7 days]
 Inodes grace time: [7 days]
 Realtime Blocks grace time: [7 days]