* [PATCH 1/3] xfs/263: don't hardcode inode numbers in output
@ 2017-01-28 17:38 Darrick J. Wong
2017-01-28 17:38 ` [PATCH 2/3] xfs/299: don't chmod the underlying mountpoints prior to mounting Darrick J. Wong
` (2 more replies)
0 siblings, 3 replies; 7+ messages in thread
From: Darrick J. Wong @ 2017-01-28 17:38 UTC (permalink / raw)
To: eguan, darrick.wong; +Cc: linux-xfs, fstests
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(-)
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]
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 2/3] xfs/299: don't chmod the underlying mountpoints prior to mounting
2017-01-28 17:38 [PATCH 1/3] xfs/263: don't hardcode inode numbers in output Darrick J. Wong
@ 2017-01-28 17:38 ` Darrick J. Wong
2017-01-28 17:38 ` [PATCH 3/3] xfs/030: ignore lost rmapbt blocks Darrick J. Wong
2017-01-28 18:10 ` [PATCH 1/3] xfs/263: don't hardcode inode numbers in output Eric Sandeen
2 siblings, 0 replies; 7+ messages in thread
From: Darrick J. Wong @ 2017-01-28 17:38 UTC (permalink / raw)
To: eguan, darrick.wong; +Cc: linux-xfs, fstests
From: Darrick J. Wong <darrick.wong@oracle.com>
It's silly to make $SCRATCH_MNT world writable just prior to mounting
the scratch device; instead, do it after the mount.
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
---
tests/xfs/299 | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/tests/xfs/299 b/tests/xfs/299
index d2670f8..997c5dc 100755
--- a/tests/xfs/299
+++ b/tests/xfs/299
@@ -203,9 +203,6 @@ cat $tmp.mkfs >>$seqres.full
# keep the blocksize and data size for dd later
. $tmp.mkfs
-# non-root users need to be able to write to this filesystem
-chmod 777 $SCRATCH_MNT
-
cat >$tmp.projects <<EOF
1:$SCRATCH_MNT
EOF
@@ -220,6 +217,10 @@ projid_file="$tmp.projid"
echo "*** user, group, and project"
_qmount_option "uquota,gquota,pquota"
_qmount
+
+# non-root users need to be able to write to this filesystem
+chmod 777 $SCRATCH_MNT
+
_exercise p
_exercise g
_exercise u
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 3/3] xfs/030: ignore lost rmapbt blocks
2017-01-28 17:38 [PATCH 1/3] xfs/263: don't hardcode inode numbers in output Darrick J. Wong
2017-01-28 17:38 ` [PATCH 2/3] xfs/299: don't chmod the underlying mountpoints prior to mounting Darrick J. Wong
@ 2017-01-28 17:38 ` Darrick J. Wong
2017-01-28 18:10 ` [PATCH 1/3] xfs/263: don't hardcode inode numbers in output Eric Sandeen
2 siblings, 0 replies; 7+ messages in thread
From: Darrick J. Wong @ 2017-01-28 17:38 UTC (permalink / raw)
To: eguan, darrick.wong; +Cc: linux-xfs, fstests
From: Darrick J. Wong <darrick.wong@oracle.com>
When we destroy the AG0 headers, we also lose track of the rmapbt
blocks, which causes xfs_repair to complain about their unconnectedness.
Filter out the error message from the output.
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
---
tests/xfs/030 | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/tests/xfs/030 b/tests/xfs/030
index 5c99d9e..15f41ed 100755
--- a/tests/xfs/030
+++ b/tests/xfs/030
@@ -60,7 +60,8 @@ _check_ag()
-e '/^bad agbno AGBNO for finobt/d' \
-e '/^bad agbno AGBNO for rmapbt/d' \
-e '/^bad agbno AGBNO for refcntbt/d' \
- -e '/^Missing reverse-mapping record.*/d'
+ -e '/^Missing reverse-mapping record.*/d' \
+ -e '/^unknown block state, ag 0, block.*/d'
done
}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 1/3] xfs/263: don't hardcode inode numbers in output
2017-01-28 17:38 [PATCH 1/3] xfs/263: don't hardcode inode numbers in output Darrick J. Wong
2017-01-28 17:38 ` [PATCH 2/3] xfs/299: don't chmod the underlying mountpoints prior to mounting Darrick J. Wong
2017-01-28 17:38 ` [PATCH 3/3] xfs/030: ignore lost rmapbt blocks Darrick J. Wong
@ 2017-01-28 18:10 ` Eric Sandeen
2017-01-28 20:30 ` Darrick J. Wong
2 siblings, 1 reply; 7+ messages in thread
From: Eric Sandeen @ 2017-01-28 18:10 UTC (permalink / raw)
To: Darrick J. Wong, eguan; +Cc: linux-xfs, fstests
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
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 1/3] xfs/263: don't hardcode inode numbers in output
2017-01-28 18:10 ` [PATCH 1/3] xfs/263: don't hardcode inode numbers in output Eric Sandeen
@ 2017-01-28 20:30 ` Darrick J. Wong
2017-02-03 6:42 ` Eryu Guan
0 siblings, 1 reply; 7+ messages in thread
From: Darrick J. Wong @ 2017-01-28 20:30 UTC (permalink / raw)
To: Eric Sandeen; +Cc: eguan, linux-xfs, fstests
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
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 1/3] xfs/263: don't hardcode inode numbers in output
2017-01-28 20:30 ` Darrick J. Wong
@ 2017-02-03 6:42 ` Eryu Guan
2017-02-03 17:46 ` Darrick J. Wong
0 siblings, 1 reply; 7+ messages in thread
From: Eryu Guan @ 2017-02-03 6:42 UTC (permalink / raw)
To: Darrick J. Wong; +Cc: Eric Sandeen, linux-xfs, fstests
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
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 1/3] xfs/263: don't hardcode inode numbers in output
2017-02-03 6:42 ` Eryu Guan
@ 2017-02-03 17:46 ` Darrick J. Wong
0 siblings, 0 replies; 7+ messages in thread
From: Darrick J. Wong @ 2017-02-03 17:46 UTC (permalink / raw)
To: Eryu Guan; +Cc: Eric Sandeen, linux-xfs, fstests
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
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2017-02-03 17:47 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-01-28 17:38 [PATCH 1/3] xfs/263: don't hardcode inode numbers in output Darrick J. Wong
2017-01-28 17:38 ` [PATCH 2/3] xfs/299: don't chmod the underlying mountpoints prior to mounting Darrick J. Wong
2017-01-28 17:38 ` [PATCH 3/3] xfs/030: ignore lost rmapbt blocks Darrick J. Wong
2017-01-28 18:10 ` [PATCH 1/3] xfs/263: don't hardcode inode numbers in output Eric Sandeen
2017-01-28 20:30 ` Darrick J. Wong
2017-02-03 6:42 ` Eryu Guan
2017-02-03 17:46 ` Darrick J. Wong
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).