[v2] xfs/018: fix LARP testing for small block sizes

Message ID	20220719222520.15550-1-catherine.hoang@oracle.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <fstests-owner@kernel.org> From: Catherine Hoang <catherine.hoang@oracle.com> To: linux-xfs@vger.kernel.org, fstests@vger.kernel.org Subject: [PATCH v2] xfs/018: fix LARP testing for small block sizes Date: Tue, 19 Jul 2022 15:25:20 -0700 Message-Id: <20220719222520.15550-1-catherine.hoang@oracle.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain MIME-Version: 1.0 Precedence: bulk
Series	[v2] xfs/018: fix LARP testing for small block sizes \| expand [v2] xfs/018: fix LARP testing for small block sizes

Message ID

20220719222520.15550-1-catherine.hoang@oracle.com (mailing list archive)

State

New, archived

Headers

From: Catherine Hoang <catherine.hoang@oracle.com>
To: linux-xfs@vger.kernel.org, fstests@vger.kernel.org
Subject: [PATCH v2] xfs/018: fix LARP testing for small block sizes
Date: Tue, 19 Jul 2022 15:25:20 -0700
Message-Id: <20220719222520.15550-1-catherine.hoang@oracle.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: 
 0KPcP3zWNof+bl1ETgiTlegF6+KDrD+xDAYT5tfKChoNR84I4/B4dwK4vUVoZrpAorhkN1JnyG6+O5eOU0fRRqkXh1oRgftZDseDoB+bffipL5SbyGjALea0CkOP75YusQ20U7UjBTt+bvnLFZ03JSipenDxGOQsxbHJ3A3IUe5a46bx6vahAaxsrCpxei7B3x5tIFupuGaNVQSaxOlRVobNMWFFE3ky+qfj8EjLYbwKjT526jPjseLTahT4pbdWwA/gH/yQnF2AvM5f+rWleYfIY7REd89ejhhvrbeGG2AdNx9Klv+mcIO+mtnX/fKBcijKWs6YIHaZ2EeA+bGii4DTrkhq/LiaQtqGssHFI2h1IxSEhh0CI4r9/9sNJxouNB3WXKIGe19l3By8FfuFTcLGIhDVUOJ+Khnr3CRvD3HOe+/J2J/7sMPZATkqduma2HLATxrWRgJwczmjzNlhGENQNNPUeTdvCrDZwyy1dwkZdOcEqMV0d1Gw8Z2k3aeEhHq8yn2CO7W9pTlOixp3rZ4eG5wZIOKJFU4fh2Ag991e4JiFPylZA17foUosS96SIVPKy9hVVYN2MEe5VOtOyyR5r8lq+fFIxrEFaFsx6ju0L+00krKlGYTNGHtOX4rc+dH7PjYWuwK89cz/4uxDvsyXjj4XZEqVuAVPKi70R7Ekw+mQwbV9Tx2Xt1hrDy+qYnKwA0O27inkPhEsYTn5pzspB+TIrB0mABBUurhpxn7sLptTaJUavOV3ZZaR6r2cteararcRst+D5sYwNZfniIUnhJfFlnNT/SvccRl+KwyYUSBvkruwlNxmHHgzl0UVa2Pxz5d9KxO6KycgiUgPA11EKfH2r6rJ1Hkp9DhG+0IJIlrlqWC7iHwz1fJJO7po/UAdYW8+vSWfssXgDi+I++pZPYbdNuyHjZRfqU+qwcMu9hPQHni44WvWZW5Hv6zhb94dOd70nt2c9XcXlu84vMBg7K8OJEYT/pllM9iS31k9HjJpGYvxDSYxF/tzlL8MavMCi95TFuvDBfWypcTfcFNGB7VvvqfNKI44Fs1ulFkwnTimLDSlFThmxDzQqrflajjW5LYpYUmrsLPedBzoYBn8+Mb00GsKtQEdCkXYeBodaZi3JIlIMvSc/tnxUOGzJACRwCHpbcetyYQ5p2FZEp9mQtbC9FDdhZYRCvGZHsC+O1IVT1lvb2QTzbNnVcBJMSKYz+HV2pF6lYdqwKdMHB4d4VfRNDv90GgDcX3MORiHiyR6mGyyR3r9kirAkzEUojUkYSx6ipDyNDo7MQg5d6sX2Yu2rJSxruKgLqkodGcwiZTcZQESWOrTEyrLwj5djHfmG1K/Ex2YMMwwIeIq0xjHyRkzEUMAz70SXwQUAsMjvB9NvECxxB/MRmL7ZdMt4VsnucKcwZAdixBuGmBE62wLamVu3wkjsd6FZTu/Z+nt5NKnyv+EhROnygMT0VQMtozZN7MVvlEWRR7UuE6u+uYNlm2nkO74F8MVeEGjG0nnqMCjYUdvzotXYAsdrFOWFDwZndOPvPi/W+e0jj8DQlzLO8nzuvgKd6Ix87AqDZ3vAnNtcPlQESbQbdUhZ5cE+QWFNMsZb1ysNXI2UgslL6a7/ue0HgwO1EngubuWotA=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 
 414dbec7-bc73-4083-5874-08da69d5950e
X-MS-Exchange-CrossTenant-AuthSource: BLAPR10MB5316.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jul 2022 22:25:27.7761
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 
 FWRBrnmh/1WqA2MjgLHdhVAOYlPpazGz9ucBvNLSxN7BCDDJKbMcFYjTOMl6jp/v2cHquT3rwbTDS73Rh9ljJJBYGEkZHdWq727c1r6ErFc=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR10MB3342
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.205,Aquarius:18.0.883,Hydra:6.0.517,FMLib:17.11.122.1
 definitions=2022-07-19_09,2022-07-19_01,2022-06-22_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0
 adultscore=0 phishscore=0
 mlxlogscore=999 spamscore=0 malwarescore=0 bulkscore=0 suspectscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2206140000
 definitions=main-2207190092
X-Proofpoint-ORIG-GUID: l6ffI31WAjxdNVGKpB_0deCqJT6AW8Ft
X-Proofpoint-GUID: l6ffI31WAjxdNVGKpB_0deCqJT6AW8Ft
Precedence: bulk
List-ID: <fstests.vger.kernel.org>
X-Mailing-List: fstests@vger.kernel.org

Series

[v2] xfs/018: fix LARP testing for small block sizes | expand

Commit Message

Catherine Hoang July 19, 2022, 10:25 p.m. UTC

From: "Darrick J. Wong" <djwong@kernel.org>

Fix this test to work properly when the filesystem block size is less
than 4k.  Tripping the error injection points on shape changes in the
xattr structure must be done dynamically.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Catherine Hoang <catherine.hoang@oracle.com>
---
 tests/xfs/018     | 14 +++++++++-----
 tests/xfs/018.out | 47 ++++-------------------------------------------
 2 files changed, 13 insertions(+), 48 deletions(-)

Comments

Allison Henderson July 20, 2022, 1:23 a.m. UTC | #1

On Tue, 2022-07-19 at 15:25 -0700, Catherine Hoang wrote:
> From: "Darrick J. Wong" <djwong@kernel.org>
> 
> Fix this test to work properly when the filesystem block size is less
> than 4k.  Tripping the error injection points on shape changes in the
> xattr structure must be done dynamically.
> 
> Signed-off-by: Darrick J. Wong <djwong@kernel.org>
> Signed-off-by: Catherine Hoang <catherine.hoang@oracle.com>
Looks good to me
Reviewed-by: Allison Henderson <allison.henderson@oracle.com>

> ---
>  tests/xfs/018     | 14 +++++++++-----
>  tests/xfs/018.out | 47 ++++-----------------------------------------
> --
>  2 files changed, 13 insertions(+), 48 deletions(-)
> 
> diff --git a/tests/xfs/018 b/tests/xfs/018
> index 041a3b24..323279b5 100755
> --- a/tests/xfs/018
> +++ b/tests/xfs/018
> @@ -47,7 +47,8 @@ test_attr_replay()
>  	touch $testfile
>  
>  	# Verify attr recovery
> -	$ATTR_PROG -l $testfile | _filter_scratch
> +	$ATTR_PROG -l $testfile >> $seqres.full
> +	echo "Checking contents of $attr_name" >> $seqres.full
>  	echo -n "$attr_name: "
>  	$ATTR_PROG -q -g $attr_name $testfile 2> /dev/null | md5sum;
>  
> @@ -98,6 +99,9 @@ attr64k="$attr32k$attr32k"
>  echo "*** mkfs"
>  _scratch_mkfs >/dev/null
>  
> +blk_sz=$(_scratch_xfs_get_sb_field blocksize)
> +multiplier=$(( $blk_sz / 276 )) # 256 + 20 to account for attr name
> +
>  echo "*** mount FS"
>  _scratch_mount
>  
> @@ -140,12 +144,12 @@ test_attr_replay extent_file1 "attr_name2"
> $attr1k "s" "larp"
>  test_attr_replay extent_file1 "attr_name2" $attr1k "r" "larp"
>  
>  # extent, inject error on split
> -create_test_file extent_file2 3 $attr1k
> -test_attr_replay extent_file2 "attr_name4" $attr1k "s"
> "da_leaf_split"
> +create_test_file extent_file2 $multiplier $attr256
> +test_attr_replay extent_file2 "attr_nameXXXX" $attr256 "s"
> "da_leaf_split"
>  
>  # extent, inject error on fork transition
> -create_test_file extent_file3 3 $attr1k
> -test_attr_replay extent_file3 "attr_name4" $attr1k "s"
> "attr_leaf_to_node"
> +create_test_file extent_file3 $multiplier $attr256
> +test_attr_replay extent_file3 "attr_nameXXXX" $attr256 "s"
> "attr_leaf_to_node"
>  
>  # extent, remote
>  create_test_file extent_file4 1 $attr1k
> diff --git a/tests/xfs/018.out b/tests/xfs/018.out
> index 022b0ca3..57dc448a 100644
> --- a/tests/xfs/018.out
> +++ b/tests/xfs/018.out
> @@ -4,7 +4,6 @@ QA output created by 018
>  attr_set: Input/output error
>  Could not set "attr_name" for SCRATCH_MNT/testdir/empty_file1
>  touch: cannot touch 'SCRATCH_MNT/testdir/empty_file1': Input/output
> error
> -Attribute "attr_name" has a 65 byte value for
> SCRATCH_MNT/testdir/empty_file1
>  attr_name: cfbe2a33be4601d2b655d099a18378fc  -
>  
>  attr_remove: Input/output error
> @@ -15,7 +14,6 @@ attr_name: d41d8cd98f00b204e9800998ecf8427e  -
>  attr_set: Input/output error
>  Could not set "attr_name" for SCRATCH_MNT/testdir/empty_file2
>  touch: cannot touch 'SCRATCH_MNT/testdir/empty_file2': Input/output
> error
> -Attribute "attr_name" has a 1025 byte value for
> SCRATCH_MNT/testdir/empty_file2
>  attr_name: 9fd415c49d67afc4b78fad4055a3a376  -
>  
>  attr_remove: Input/output error
> @@ -26,7 +24,6 @@ attr_name: d41d8cd98f00b204e9800998ecf8427e  -
>  attr_set: Input/output error
>  Could not set "attr_name" for SCRATCH_MNT/testdir/empty_file3
>  touch: cannot touch 'SCRATCH_MNT/testdir/empty_file3': Input/output
> error
> -Attribute "attr_name" has a 65536 byte value for
> SCRATCH_MNT/testdir/empty_file3
>  attr_name: 7f6fd1b6d872108bd44bd143cbcdfa19  -
>  
>  attr_remove: Input/output error
> @@ -37,132 +34,96 @@ attr_name: d41d8cd98f00b204e9800998ecf8427e  -
>  attr_set: Input/output error
>  Could not set "attr_name2" for SCRATCH_MNT/testdir/inline_file1
>  touch: cannot touch 'SCRATCH_MNT/testdir/inline_file1': Input/output
> error
> -Attribute "attr_name1" has a 16 byte value for
> SCRATCH_MNT/testdir/inline_file1
> -Attribute "attr_name2" has a 65 byte value for
> SCRATCH_MNT/testdir/inline_file1
>  attr_name2: cfbe2a33be4601d2b655d099a18378fc  -
>  
>  attr_remove: Input/output error
>  Could not remove "attr_name2" for SCRATCH_MNT/testdir/inline_file1
>  touch: cannot touch 'SCRATCH_MNT/testdir/inline_file1': Input/output
> error
> -Attribute "attr_name1" has a 16 byte value for
> SCRATCH_MNT/testdir/inline_file1
>  attr_name2: d41d8cd98f00b204e9800998ecf8427e  -
>  
>  attr_set: Input/output error
>  Could not set "attr_name2" for SCRATCH_MNT/testdir/inline_file2
>  touch: cannot touch 'SCRATCH_MNT/testdir/inline_file2': Input/output
> error
> -Attribute "attr_name2" has a 1025 byte value for
> SCRATCH_MNT/testdir/inline_file2
> -Attribute "attr_name1" has a 16 byte value for
> SCRATCH_MNT/testdir/inline_file2
>  attr_name2: 9fd415c49d67afc4b78fad4055a3a376  -
>  
>  attr_remove: Input/output error
>  Could not remove "attr_name2" for SCRATCH_MNT/testdir/inline_file2
>  touch: cannot touch 'SCRATCH_MNT/testdir/inline_file2': Input/output
> error
> -Attribute "attr_name1" has a 16 byte value for
> SCRATCH_MNT/testdir/inline_file2
>  attr_name2: d41d8cd98f00b204e9800998ecf8427e  -
>  
>  attr_set: Input/output error
>  Could not set "attr_name2" for SCRATCH_MNT/testdir/inline_file3
>  touch: cannot touch 'SCRATCH_MNT/testdir/inline_file3': Input/output
> error
> -Attribute "attr_name2" has a 65536 byte value for
> SCRATCH_MNT/testdir/inline_file3
> -Attribute "attr_name1" has a 16 byte value for
> SCRATCH_MNT/testdir/inline_file3
>  attr_name2: 7f6fd1b6d872108bd44bd143cbcdfa19  -
>  
>  attr_remove: Input/output error
>  Could not remove "attr_name2" for SCRATCH_MNT/testdir/inline_file3
>  touch: cannot touch 'SCRATCH_MNT/testdir/inline_file3': Input/output
> error
> -Attribute "attr_name1" has a 16 byte value for
> SCRATCH_MNT/testdir/inline_file3
>  attr_name2: d41d8cd98f00b204e9800998ecf8427e  -
>  
>  attr_set: Input/output error
>  Could not set "attr_name2" for SCRATCH_MNT/testdir/extent_file1
>  touch: cannot touch 'SCRATCH_MNT/testdir/extent_file1': Input/output
> error
> -Attribute "attr_name2" has a 1025 byte value for
> SCRATCH_MNT/testdir/extent_file1
> -Attribute "attr_name1" has a 1024 byte value for
> SCRATCH_MNT/testdir/extent_file1
>  attr_name2: 9fd415c49d67afc4b78fad4055a3a376  -
>  
>  attr_remove: Input/output error
>  Could not remove "attr_name2" for SCRATCH_MNT/testdir/extent_file1
>  touch: cannot touch 'SCRATCH_MNT/testdir/extent_file1': Input/output
> error
> -Attribute "attr_name1" has a 1024 byte value for
> SCRATCH_MNT/testdir/extent_file1
>  attr_name2: d41d8cd98f00b204e9800998ecf8427e  -
>  
>  attr_set: Input/output error
> -Could not set "attr_name4" for SCRATCH_MNT/testdir/extent_file2
> +Could not set "attr_nameXXXX" for SCRATCH_MNT/testdir/extent_file2
>  touch: cannot touch 'SCRATCH_MNT/testdir/extent_file2': Input/output
> error
> -Attribute "attr_name4" has a 1025 byte value for
> SCRATCH_MNT/testdir/extent_file2
> -Attribute "attr_name2" has a 1024 byte value for
> SCRATCH_MNT/testdir/extent_file2
> -Attribute "attr_name3" has a 1024 byte value for
> SCRATCH_MNT/testdir/extent_file2
> -Attribute "attr_name1" has a 1024 byte value for
> SCRATCH_MNT/testdir/extent_file2
> -attr_name4: 9fd415c49d67afc4b78fad4055a3a376  -
> +attr_nameXXXX: f4ea5799d72a0a9bf2d56a685c9cba7a  -
>  
>  attr_set: Input/output error
> -Could not set "attr_name4" for SCRATCH_MNT/testdir/extent_file3
> +Could not set "attr_nameXXXX" for SCRATCH_MNT/testdir/extent_file3
>  touch: cannot touch 'SCRATCH_MNT/testdir/extent_file3': Input/output
> error
> -Attribute "attr_name4" has a 1025 byte value for
> SCRATCH_MNT/testdir/extent_file3
> -Attribute "attr_name2" has a 1024 byte value for
> SCRATCH_MNT/testdir/extent_file3
> -Attribute "attr_name3" has a 1024 byte value for
> SCRATCH_MNT/testdir/extent_file3
> -Attribute "attr_name1" has a 1024 byte value for
> SCRATCH_MNT/testdir/extent_file3
> -attr_name4: 9fd415c49d67afc4b78fad4055a3a376  -
> +attr_nameXXXX: f4ea5799d72a0a9bf2d56a685c9cba7a  -
>  
>  attr_set: Input/output error
>  Could not set "attr_name2" for SCRATCH_MNT/testdir/extent_file4
>  touch: cannot touch 'SCRATCH_MNT/testdir/extent_file4': Input/output
> error
> -Attribute "attr_name2" has a 65536 byte value for
> SCRATCH_MNT/testdir/extent_file4
> -Attribute "attr_name1" has a 1024 byte value for
> SCRATCH_MNT/testdir/extent_file4
>  attr_name2: 7f6fd1b6d872108bd44bd143cbcdfa19  -
>  
>  attr_remove: Input/output error
>  Could not remove "attr_name2" for SCRATCH_MNT/testdir/extent_file4
>  touch: cannot touch 'SCRATCH_MNT/testdir/extent_file4': Input/output
> error
> -Attribute "attr_name1" has a 1024 byte value for
> SCRATCH_MNT/testdir/extent_file4
>  attr_name2: d41d8cd98f00b204e9800998ecf8427e  -
>  
>  attr_set: Input/output error
>  Could not set "attr_name2" for SCRATCH_MNT/testdir/remote_file1
>  touch: cannot touch 'SCRATCH_MNT/testdir/remote_file1': Input/output
> error
> -Attribute "attr_name2" has a 1025 byte value for
> SCRATCH_MNT/testdir/remote_file1
> -Attribute "attr_name1" has a 65536 byte value for
> SCRATCH_MNT/testdir/remote_file1
>  attr_name2: 9fd415c49d67afc4b78fad4055a3a376  -
>  
>  attr_remove: Input/output error
>  Could not remove "attr_name2" for SCRATCH_MNT/testdir/remote_file1
>  touch: cannot touch 'SCRATCH_MNT/testdir/remote_file1': Input/output
> error
> -Attribute "attr_name1" has a 65536 byte value for
> SCRATCH_MNT/testdir/remote_file1
>  attr_name2: d41d8cd98f00b204e9800998ecf8427e  -
>  
>  attr_set: Input/output error
>  Could not set "attr_name2" for SCRATCH_MNT/testdir/remote_file2
>  touch: cannot touch 'SCRATCH_MNT/testdir/remote_file2': Input/output
> error
> -Attribute "attr_name2" has a 65536 byte value for
> SCRATCH_MNT/testdir/remote_file2
> -Attribute "attr_name1" has a 65536 byte value for
> SCRATCH_MNT/testdir/remote_file2
>  attr_name2: 7f6fd1b6d872108bd44bd143cbcdfa19  -
>  
>  attr_remove: Input/output error
>  Could not remove "attr_name2" for SCRATCH_MNT/testdir/remote_file2
>  touch: cannot touch 'SCRATCH_MNT/testdir/remote_file2': Input/output
> error
> -Attribute "attr_name1" has a 65536 byte value for
> SCRATCH_MNT/testdir/remote_file2
>  attr_name2: d41d8cd98f00b204e9800998ecf8427e  -
>  
>  attr_set: Input/output error
>  Could not set "attr_name2" for SCRATCH_MNT/testdir/sf_file
>  touch: cannot touch 'SCRATCH_MNT/testdir/sf_file': Input/output
> error
> -Attribute "attr_name1" has a 64 byte value for
> SCRATCH_MNT/testdir/sf_file
> -Attribute "attr_name2" has a 17 byte value for
> SCRATCH_MNT/testdir/sf_file
>  attr_name2: 9a6eb1bc9da3c66a9b495dfe2fe8a756  -
>  
>  attr_set: Input/output error
>  Could not set "attr_name2" for SCRATCH_MNT/testdir/leaf_file
>  touch: cannot touch 'SCRATCH_MNT/testdir/leaf_file': Input/output
> error
> -Attribute "attr_name2" has a 257 byte value for
> SCRATCH_MNT/testdir/leaf_file
> -Attribute "attr_name3" has a 1024 byte value for
> SCRATCH_MNT/testdir/leaf_file
> -Attribute "attr_name1" has a 1024 byte value for
> SCRATCH_MNT/testdir/leaf_file
>  attr_name2: f4ea5799d72a0a9bf2d56a685c9cba7a  -
>  
>  attr_set: Input/output error
>  Could not set "attr_name2" for SCRATCH_MNT/testdir/node_file
>  touch: cannot touch 'SCRATCH_MNT/testdir/node_file': Input/output
> error
> -Attribute "attr_name2" has a 257 byte value for
> SCRATCH_MNT/testdir/node_file
> -Attribute "attr_name1" has a 65536 byte value for
> SCRATCH_MNT/testdir/node_file
>  attr_name2: f4ea5799d72a0a9bf2d56a685c9cba7a  -
>  
>  *** done

Darrick J. Wong July 20, 2022, 5:25 p.m. UTC | #2

On Tue, Jul 19, 2022 at 03:25:20PM -0700, Catherine Hoang wrote:
> From: "Darrick J. Wong" <djwong@kernel.org>
> 
> Fix this test to work properly when the filesystem block size is less
> than 4k.  Tripping the error injection points on shape changes in the
> xattr structure must be done dynamically.
> 
> Signed-off-by: Darrick J. Wong <djwong@kernel.org>
> Signed-off-by: Catherine Hoang <catherine.hoang@oracle.com>

Hrmm.  I tried this on an 8k-blocksize filesystem overnight (arm64, 64k
pages), and got this:

--- xfs/018.out
+++ xfs/018.out.bad
@@ -71,14 +71,14 @@
 touch: cannot touch 'SCRATCH_MNT/testdir/extent_file1': Input/output error
 attr_name2: d41d8cd98f00b204e9800998ecf8427e  -
 
-attr_set: Input/output error
-Could not set "attr_nameXXXX" for SCRATCH_MNT/testdir/extent_file2
-touch: cannot touch 'SCRATCH_MNT/testdir/extent_file2': Input/output error
+Attribute "attr_nameXXXX" set to a 257 byte value for SCRATCH_MNT/testdir/extent_file2:
+0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF
+
 attr_nameXXXX: f4ea5799d72a0a9bf2d56a685c9cba7a  -
 
-attr_set: Input/output error
-Could not set "attr_nameXXXX" for SCRATCH_MNT/testdir/extent_file3
-touch: cannot touch 'SCRATCH_MNT/testdir/extent_file3': Input/output error
+Attribute "attr_nameXXXX" set to a 257 byte value for SCRATCH_MNT/testdir/extent_file3:
+0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF
+
 attr_nameXXXX: f4ea5799d72a0a9bf2d56a685c9cba7a  -
 
 attr_set: Input/output error

Not sure what that's all about, but could you please take a look?

--D

> ---
>  tests/xfs/018     | 14 +++++++++-----
>  tests/xfs/018.out | 47 ++++-------------------------------------------
>  2 files changed, 13 insertions(+), 48 deletions(-)
> 
> diff --git a/tests/xfs/018 b/tests/xfs/018
> index 041a3b24..323279b5 100755
> --- a/tests/xfs/018
> +++ b/tests/xfs/018
> @@ -47,7 +47,8 @@ test_attr_replay()
>  	touch $testfile
>  
>  	# Verify attr recovery
> -	$ATTR_PROG -l $testfile | _filter_scratch
> +	$ATTR_PROG -l $testfile >> $seqres.full
> +	echo "Checking contents of $attr_name" >> $seqres.full
>  	echo -n "$attr_name: "
>  	$ATTR_PROG -q -g $attr_name $testfile 2> /dev/null | md5sum;
>  
> @@ -98,6 +99,9 @@ attr64k="$attr32k$attr32k"
>  echo "*** mkfs"
>  _scratch_mkfs >/dev/null
>  
> +blk_sz=$(_scratch_xfs_get_sb_field blocksize)
> +multiplier=$(( $blk_sz / 276 )) # 256 + 20 to account for attr name
> +
>  echo "*** mount FS"
>  _scratch_mount
>  
> @@ -140,12 +144,12 @@ test_attr_replay extent_file1 "attr_name2" $attr1k "s" "larp"
>  test_attr_replay extent_file1 "attr_name2" $attr1k "r" "larp"
>  
>  # extent, inject error on split
> -create_test_file extent_file2 3 $attr1k
> -test_attr_replay extent_file2 "attr_name4" $attr1k "s" "da_leaf_split"
> +create_test_file extent_file2 $multiplier $attr256
> +test_attr_replay extent_file2 "attr_nameXXXX" $attr256 "s" "da_leaf_split"
>  
>  # extent, inject error on fork transition
> -create_test_file extent_file3 3 $attr1k
> -test_attr_replay extent_file3 "attr_name4" $attr1k "s" "attr_leaf_to_node"
> +create_test_file extent_file3 $multiplier $attr256
> +test_attr_replay extent_file3 "attr_nameXXXX" $attr256 "s" "attr_leaf_to_node"
>  
>  # extent, remote
>  create_test_file extent_file4 1 $attr1k
> diff --git a/tests/xfs/018.out b/tests/xfs/018.out
> index 022b0ca3..57dc448a 100644
> --- a/tests/xfs/018.out
> +++ b/tests/xfs/018.out
> @@ -4,7 +4,6 @@ QA output created by 018
>  attr_set: Input/output error
>  Could not set "attr_name" for SCRATCH_MNT/testdir/empty_file1
>  touch: cannot touch 'SCRATCH_MNT/testdir/empty_file1': Input/output error
> -Attribute "attr_name" has a 65 byte value for SCRATCH_MNT/testdir/empty_file1
>  attr_name: cfbe2a33be4601d2b655d099a18378fc  -
>  
>  attr_remove: Input/output error
> @@ -15,7 +14,6 @@ attr_name: d41d8cd98f00b204e9800998ecf8427e  -
>  attr_set: Input/output error
>  Could not set "attr_name" for SCRATCH_MNT/testdir/empty_file2
>  touch: cannot touch 'SCRATCH_MNT/testdir/empty_file2': Input/output error
> -Attribute "attr_name" has a 1025 byte value for SCRATCH_MNT/testdir/empty_file2
>  attr_name: 9fd415c49d67afc4b78fad4055a3a376  -
>  
>  attr_remove: Input/output error
> @@ -26,7 +24,6 @@ attr_name: d41d8cd98f00b204e9800998ecf8427e  -
>  attr_set: Input/output error
>  Could not set "attr_name" for SCRATCH_MNT/testdir/empty_file3
>  touch: cannot touch 'SCRATCH_MNT/testdir/empty_file3': Input/output error
> -Attribute "attr_name" has a 65536 byte value for SCRATCH_MNT/testdir/empty_file3
>  attr_name: 7f6fd1b6d872108bd44bd143cbcdfa19  -
>  
>  attr_remove: Input/output error
> @@ -37,132 +34,96 @@ attr_name: d41d8cd98f00b204e9800998ecf8427e  -
>  attr_set: Input/output error
>  Could not set "attr_name2" for SCRATCH_MNT/testdir/inline_file1
>  touch: cannot touch 'SCRATCH_MNT/testdir/inline_file1': Input/output error
> -Attribute "attr_name1" has a 16 byte value for SCRATCH_MNT/testdir/inline_file1
> -Attribute "attr_name2" has a 65 byte value for SCRATCH_MNT/testdir/inline_file1
>  attr_name2: cfbe2a33be4601d2b655d099a18378fc  -
>  
>  attr_remove: Input/output error
>  Could not remove "attr_name2" for SCRATCH_MNT/testdir/inline_file1
>  touch: cannot touch 'SCRATCH_MNT/testdir/inline_file1': Input/output error
> -Attribute "attr_name1" has a 16 byte value for SCRATCH_MNT/testdir/inline_file1
>  attr_name2: d41d8cd98f00b204e9800998ecf8427e  -
>  
>  attr_set: Input/output error
>  Could not set "attr_name2" for SCRATCH_MNT/testdir/inline_file2
>  touch: cannot touch 'SCRATCH_MNT/testdir/inline_file2': Input/output error
> -Attribute "attr_name2" has a 1025 byte value for SCRATCH_MNT/testdir/inline_file2
> -Attribute "attr_name1" has a 16 byte value for SCRATCH_MNT/testdir/inline_file2
>  attr_name2: 9fd415c49d67afc4b78fad4055a3a376  -
>  
>  attr_remove: Input/output error
>  Could not remove "attr_name2" for SCRATCH_MNT/testdir/inline_file2
>  touch: cannot touch 'SCRATCH_MNT/testdir/inline_file2': Input/output error
> -Attribute "attr_name1" has a 16 byte value for SCRATCH_MNT/testdir/inline_file2
>  attr_name2: d41d8cd98f00b204e9800998ecf8427e  -
>  
>  attr_set: Input/output error
>  Could not set "attr_name2" for SCRATCH_MNT/testdir/inline_file3
>  touch: cannot touch 'SCRATCH_MNT/testdir/inline_file3': Input/output error
> -Attribute "attr_name2" has a 65536 byte value for SCRATCH_MNT/testdir/inline_file3
> -Attribute "attr_name1" has a 16 byte value for SCRATCH_MNT/testdir/inline_file3
>  attr_name2: 7f6fd1b6d872108bd44bd143cbcdfa19  -
>  
>  attr_remove: Input/output error
>  Could not remove "attr_name2" for SCRATCH_MNT/testdir/inline_file3
>  touch: cannot touch 'SCRATCH_MNT/testdir/inline_file3': Input/output error
> -Attribute "attr_name1" has a 16 byte value for SCRATCH_MNT/testdir/inline_file3
>  attr_name2: d41d8cd98f00b204e9800998ecf8427e  -
>  
>  attr_set: Input/output error
>  Could not set "attr_name2" for SCRATCH_MNT/testdir/extent_file1
>  touch: cannot touch 'SCRATCH_MNT/testdir/extent_file1': Input/output error
> -Attribute "attr_name2" has a 1025 byte value for SCRATCH_MNT/testdir/extent_file1
> -Attribute "attr_name1" has a 1024 byte value for SCRATCH_MNT/testdir/extent_file1
>  attr_name2: 9fd415c49d67afc4b78fad4055a3a376  -
>  
>  attr_remove: Input/output error
>  Could not remove "attr_name2" for SCRATCH_MNT/testdir/extent_file1
>  touch: cannot touch 'SCRATCH_MNT/testdir/extent_file1': Input/output error
> -Attribute "attr_name1" has a 1024 byte value for SCRATCH_MNT/testdir/extent_file1
>  attr_name2: d41d8cd98f00b204e9800998ecf8427e  -
>  
>  attr_set: Input/output error
> -Could not set "attr_name4" for SCRATCH_MNT/testdir/extent_file2
> +Could not set "attr_nameXXXX" for SCRATCH_MNT/testdir/extent_file2
>  touch: cannot touch 'SCRATCH_MNT/testdir/extent_file2': Input/output error
> -Attribute "attr_name4" has a 1025 byte value for SCRATCH_MNT/testdir/extent_file2
> -Attribute "attr_name2" has a 1024 byte value for SCRATCH_MNT/testdir/extent_file2
> -Attribute "attr_name3" has a 1024 byte value for SCRATCH_MNT/testdir/extent_file2
> -Attribute "attr_name1" has a 1024 byte value for SCRATCH_MNT/testdir/extent_file2
> -attr_name4: 9fd415c49d67afc4b78fad4055a3a376  -
> +attr_nameXXXX: f4ea5799d72a0a9bf2d56a685c9cba7a  -
>  
>  attr_set: Input/output error
> -Could not set "attr_name4" for SCRATCH_MNT/testdir/extent_file3
> +Could not set "attr_nameXXXX" for SCRATCH_MNT/testdir/extent_file3
>  touch: cannot touch 'SCRATCH_MNT/testdir/extent_file3': Input/output error
> -Attribute "attr_name4" has a 1025 byte value for SCRATCH_MNT/testdir/extent_file3
> -Attribute "attr_name2" has a 1024 byte value for SCRATCH_MNT/testdir/extent_file3
> -Attribute "attr_name3" has a 1024 byte value for SCRATCH_MNT/testdir/extent_file3
> -Attribute "attr_name1" has a 1024 byte value for SCRATCH_MNT/testdir/extent_file3
> -attr_name4: 9fd415c49d67afc4b78fad4055a3a376  -
> +attr_nameXXXX: f4ea5799d72a0a9bf2d56a685c9cba7a  -
>  
>  attr_set: Input/output error
>  Could not set "attr_name2" for SCRATCH_MNT/testdir/extent_file4
>  touch: cannot touch 'SCRATCH_MNT/testdir/extent_file4': Input/output error
> -Attribute "attr_name2" has a 65536 byte value for SCRATCH_MNT/testdir/extent_file4
> -Attribute "attr_name1" has a 1024 byte value for SCRATCH_MNT/testdir/extent_file4
>  attr_name2: 7f6fd1b6d872108bd44bd143cbcdfa19  -
>  
>  attr_remove: Input/output error
>  Could not remove "attr_name2" for SCRATCH_MNT/testdir/extent_file4
>  touch: cannot touch 'SCRATCH_MNT/testdir/extent_file4': Input/output error
> -Attribute "attr_name1" has a 1024 byte value for SCRATCH_MNT/testdir/extent_file4
>  attr_name2: d41d8cd98f00b204e9800998ecf8427e  -
>  
>  attr_set: Input/output error
>  Could not set "attr_name2" for SCRATCH_MNT/testdir/remote_file1
>  touch: cannot touch 'SCRATCH_MNT/testdir/remote_file1': Input/output error
> -Attribute "attr_name2" has a 1025 byte value for SCRATCH_MNT/testdir/remote_file1
> -Attribute "attr_name1" has a 65536 byte value for SCRATCH_MNT/testdir/remote_file1
>  attr_name2: 9fd415c49d67afc4b78fad4055a3a376  -
>  
>  attr_remove: Input/output error
>  Could not remove "attr_name2" for SCRATCH_MNT/testdir/remote_file1
>  touch: cannot touch 'SCRATCH_MNT/testdir/remote_file1': Input/output error
> -Attribute "attr_name1" has a 65536 byte value for SCRATCH_MNT/testdir/remote_file1
>  attr_name2: d41d8cd98f00b204e9800998ecf8427e  -
>  
>  attr_set: Input/output error
>  Could not set "attr_name2" for SCRATCH_MNT/testdir/remote_file2
>  touch: cannot touch 'SCRATCH_MNT/testdir/remote_file2': Input/output error
> -Attribute "attr_name2" has a 65536 byte value for SCRATCH_MNT/testdir/remote_file2
> -Attribute "attr_name1" has a 65536 byte value for SCRATCH_MNT/testdir/remote_file2
>  attr_name2: 7f6fd1b6d872108bd44bd143cbcdfa19  -
>  
>  attr_remove: Input/output error
>  Could not remove "attr_name2" for SCRATCH_MNT/testdir/remote_file2
>  touch: cannot touch 'SCRATCH_MNT/testdir/remote_file2': Input/output error
> -Attribute "attr_name1" has a 65536 byte value for SCRATCH_MNT/testdir/remote_file2
>  attr_name2: d41d8cd98f00b204e9800998ecf8427e  -
>  
>  attr_set: Input/output error
>  Could not set "attr_name2" for SCRATCH_MNT/testdir/sf_file
>  touch: cannot touch 'SCRATCH_MNT/testdir/sf_file': Input/output error
> -Attribute "attr_name1" has a 64 byte value for SCRATCH_MNT/testdir/sf_file
> -Attribute "attr_name2" has a 17 byte value for SCRATCH_MNT/testdir/sf_file
>  attr_name2: 9a6eb1bc9da3c66a9b495dfe2fe8a756  -
>  
>  attr_set: Input/output error
>  Could not set "attr_name2" for SCRATCH_MNT/testdir/leaf_file
>  touch: cannot touch 'SCRATCH_MNT/testdir/leaf_file': Input/output error
> -Attribute "attr_name2" has a 257 byte value for SCRATCH_MNT/testdir/leaf_file
> -Attribute "attr_name3" has a 1024 byte value for SCRATCH_MNT/testdir/leaf_file
> -Attribute "attr_name1" has a 1024 byte value for SCRATCH_MNT/testdir/leaf_file
>  attr_name2: f4ea5799d72a0a9bf2d56a685c9cba7a  -
>  
>  attr_set: Input/output error
>  Could not set "attr_name2" for SCRATCH_MNT/testdir/node_file
>  touch: cannot touch 'SCRATCH_MNT/testdir/node_file': Input/output error
> -Attribute "attr_name2" has a 257 byte value for SCRATCH_MNT/testdir/node_file
> -Attribute "attr_name1" has a 65536 byte value for SCRATCH_MNT/testdir/node_file
>  attr_name2: f4ea5799d72a0a9bf2d56a685c9cba7a  -
>  
>  *** done
> -- 
> 2.25.1
>

Catherine Hoang July 20, 2022, 10:47 p.m. UTC | #3

> On Jul 20, 2022, at 10:25 AM, Darrick J. Wong <djwong@kernel.org> wrote:
> 
> On Tue, Jul 19, 2022 at 03:25:20PM -0700, Catherine Hoang wrote:
>> From: "Darrick J. Wong" <djwong@kernel.org>
>> 
>> Fix this test to work properly when the filesystem block size is less
>> than 4k.  Tripping the error injection points on shape changes in the
>> xattr structure must be done dynamically.
>> 
>> Signed-off-by: Darrick J. Wong <djwong@kernel.org>
>> Signed-off-by: Catherine Hoang <catherine.hoang@oracle.com>
> 
> Hrmm.  I tried this on an 8k-blocksize filesystem overnight (arm64, 64k
> pages), and got this:
> 
> --- xfs/018.out
> +++ xfs/018.out.bad
> @@ -71,14 +71,14 @@
> touch: cannot touch 'SCRATCH_MNT/testdir/extent_file1': Input/output error
> attr_name2: d41d8cd98f00b204e9800998ecf8427e  -
> 
> -attr_set: Input/output error
> -Could not set "attr_nameXXXX" for SCRATCH_MNT/testdir/extent_file2
> -touch: cannot touch 'SCRATCH_MNT/testdir/extent_file2': Input/output error
> +Attribute "attr_nameXXXX" set to a 257 byte value for SCRATCH_MNT/testdir/extent_file2:
> +0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF
> +
> attr_nameXXXX: f4ea5799d72a0a9bf2d56a685c9cba7a  -
> 
> -attr_set: Input/output error
> -Could not set "attr_nameXXXX" for SCRATCH_MNT/testdir/extent_file3
> -touch: cannot touch 'SCRATCH_MNT/testdir/extent_file3': Input/output error
> +Attribute "attr_nameXXXX" set to a 257 byte value for SCRATCH_MNT/testdir/extent_file3:
> +0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF
> +
> attr_nameXXXX: f4ea5799d72a0a9bf2d56a685c9cba7a  -
> 
> attr_set: Input/output error
> 
> Not sure what that's all about, but could you please take a look?
> 
> --D

It looks like the error tags aren’t being triggered on an 8k block
size, probably because we’re adding too few / too many attrs.
I’ll try adjusting the calculation for how many attributes are added.

Catherine
> 
>> ---
>> tests/xfs/018     | 14 +++++++++-----
>> tests/xfs/018.out | 47 ++++-------------------------------------------
>> 2 files changed, 13 insertions(+), 48 deletions(-)
>> 
>> diff --git a/tests/xfs/018 b/tests/xfs/018
>> index 041a3b24..323279b5 100755
>> --- a/tests/xfs/018
>> +++ b/tests/xfs/018
>> @@ -47,7 +47,8 @@ test_attr_replay()
>> 	touch $testfile
>> 
>> 	# Verify attr recovery
>> -	$ATTR_PROG -l $testfile | _filter_scratch
>> +	$ATTR_PROG -l $testfile >> $seqres.full
>> +	echo "Checking contents of $attr_name" >> $seqres.full
>> 	echo -n "$attr_name: "
>> 	$ATTR_PROG -q -g $attr_name $testfile 2> /dev/null | md5sum;
>> 
>> @@ -98,6 +99,9 @@ attr64k="$attr32k$attr32k"
>> echo "*** mkfs"
>> _scratch_mkfs >/dev/null
>> 
>> +blk_sz=$(_scratch_xfs_get_sb_field blocksize)
>> +multiplier=$(( $blk_sz / 276 )) # 256 + 20 to account for attr name
>> +
>> echo "*** mount FS"
>> _scratch_mount
>> 
>> @@ -140,12 +144,12 @@ test_attr_replay extent_file1 "attr_name2" $attr1k "s" "larp"
>> test_attr_replay extent_file1 "attr_name2" $attr1k "r" "larp"
>> 
>> # extent, inject error on split
>> -create_test_file extent_file2 3 $attr1k
>> -test_attr_replay extent_file2 "attr_name4" $attr1k "s" "da_leaf_split"
>> +create_test_file extent_file2 $multiplier $attr256
>> +test_attr_replay extent_file2 "attr_nameXXXX" $attr256 "s" "da_leaf_split"
>> 
>> # extent, inject error on fork transition
>> -create_test_file extent_file3 3 $attr1k
>> -test_attr_replay extent_file3 "attr_name4" $attr1k "s" "attr_leaf_to_node"
>> +create_test_file extent_file3 $multiplier $attr256
>> +test_attr_replay extent_file3 "attr_nameXXXX" $attr256 "s" "attr_leaf_to_node"
>> 
>> # extent, remote
>> create_test_file extent_file4 1 $attr1k
>> diff --git a/tests/xfs/018.out b/tests/xfs/018.out
>> index 022b0ca3..57dc448a 100644
>> --- a/tests/xfs/018.out
>> +++ b/tests/xfs/018.out
>> @@ -4,7 +4,6 @@ QA output created by 018
>> attr_set: Input/output error
>> Could not set "attr_name" for SCRATCH_MNT/testdir/empty_file1
>> touch: cannot touch 'SCRATCH_MNT/testdir/empty_file1': Input/output error
>> -Attribute "attr_name" has a 65 byte value for SCRATCH_MNT/testdir/empty_file1
>> attr_name: cfbe2a33be4601d2b655d099a18378fc  -
>> 
>> attr_remove: Input/output error
>> @@ -15,7 +14,6 @@ attr_name: d41d8cd98f00b204e9800998ecf8427e  -
>> attr_set: Input/output error
>> Could not set "attr_name" for SCRATCH_MNT/testdir/empty_file2
>> touch: cannot touch 'SCRATCH_MNT/testdir/empty_file2': Input/output error
>> -Attribute "attr_name" has a 1025 byte value for SCRATCH_MNT/testdir/empty_file2
>> attr_name: 9fd415c49d67afc4b78fad4055a3a376  -
>> 
>> attr_remove: Input/output error
>> @@ -26,7 +24,6 @@ attr_name: d41d8cd98f00b204e9800998ecf8427e  -
>> attr_set: Input/output error
>> Could not set "attr_name" for SCRATCH_MNT/testdir/empty_file3
>> touch: cannot touch 'SCRATCH_MNT/testdir/empty_file3': Input/output error
>> -Attribute "attr_name" has a 65536 byte value for SCRATCH_MNT/testdir/empty_file3
>> attr_name: 7f6fd1b6d872108bd44bd143cbcdfa19  -
>> 
>> attr_remove: Input/output error
>> @@ -37,132 +34,96 @@ attr_name: d41d8cd98f00b204e9800998ecf8427e  -
>> attr_set: Input/output error
>> Could not set "attr_name2" for SCRATCH_MNT/testdir/inline_file1
>> touch: cannot touch 'SCRATCH_MNT/testdir/inline_file1': Input/output error
>> -Attribute "attr_name1" has a 16 byte value for SCRATCH_MNT/testdir/inline_file1
>> -Attribute "attr_name2" has a 65 byte value for SCRATCH_MNT/testdir/inline_file1
>> attr_name2: cfbe2a33be4601d2b655d099a18378fc  -
>> 
>> attr_remove: Input/output error
>> Could not remove "attr_name2" for SCRATCH_MNT/testdir/inline_file1
>> touch: cannot touch 'SCRATCH_MNT/testdir/inline_file1': Input/output error
>> -Attribute "attr_name1" has a 16 byte value for SCRATCH_MNT/testdir/inline_file1
>> attr_name2: d41d8cd98f00b204e9800998ecf8427e  -
>> 
>> attr_set: Input/output error
>> Could not set "attr_name2" for SCRATCH_MNT/testdir/inline_file2
>> touch: cannot touch 'SCRATCH_MNT/testdir/inline_file2': Input/output error
>> -Attribute "attr_name2" has a 1025 byte value for SCRATCH_MNT/testdir/inline_file2
>> -Attribute "attr_name1" has a 16 byte value for SCRATCH_MNT/testdir/inline_file2
>> attr_name2: 9fd415c49d67afc4b78fad4055a3a376  -
>> 
>> attr_remove: Input/output error
>> Could not remove "attr_name2" for SCRATCH_MNT/testdir/inline_file2
>> touch: cannot touch 'SCRATCH_MNT/testdir/inline_file2': Input/output error
>> -Attribute "attr_name1" has a 16 byte value for SCRATCH_MNT/testdir/inline_file2
>> attr_name2: d41d8cd98f00b204e9800998ecf8427e  -
>> 
>> attr_set: Input/output error
>> Could not set "attr_name2" for SCRATCH_MNT/testdir/inline_file3
>> touch: cannot touch 'SCRATCH_MNT/testdir/inline_file3': Input/output error
>> -Attribute "attr_name2" has a 65536 byte value for SCRATCH_MNT/testdir/inline_file3
>> -Attribute "attr_name1" has a 16 byte value for SCRATCH_MNT/testdir/inline_file3
>> attr_name2: 7f6fd1b6d872108bd44bd143cbcdfa19  -
>> 
>> attr_remove: Input/output error
>> Could not remove "attr_name2" for SCRATCH_MNT/testdir/inline_file3
>> touch: cannot touch 'SCRATCH_MNT/testdir/inline_file3': Input/output error
>> -Attribute "attr_name1" has a 16 byte value for SCRATCH_MNT/testdir/inline_file3
>> attr_name2: d41d8cd98f00b204e9800998ecf8427e  -
>> 
>> attr_set: Input/output error
>> Could not set "attr_name2" for SCRATCH_MNT/testdir/extent_file1
>> touch: cannot touch 'SCRATCH_MNT/testdir/extent_file1': Input/output error
>> -Attribute "attr_name2" has a 1025 byte value for SCRATCH_MNT/testdir/extent_file1
>> -Attribute "attr_name1" has a 1024 byte value for SCRATCH_MNT/testdir/extent_file1
>> attr_name2: 9fd415c49d67afc4b78fad4055a3a376  -
>> 
>> attr_remove: Input/output error
>> Could not remove "attr_name2" for SCRATCH_MNT/testdir/extent_file1
>> touch: cannot touch 'SCRATCH_MNT/testdir/extent_file1': Input/output error
>> -Attribute "attr_name1" has a 1024 byte value for SCRATCH_MNT/testdir/extent_file1
>> attr_name2: d41d8cd98f00b204e9800998ecf8427e  -
>> 
>> attr_set: Input/output error
>> -Could not set "attr_name4" for SCRATCH_MNT/testdir/extent_file2
>> +Could not set "attr_nameXXXX" for SCRATCH_MNT/testdir/extent_file2
>> touch: cannot touch 'SCRATCH_MNT/testdir/extent_file2': Input/output error
>> -Attribute "attr_name4" has a 1025 byte value for SCRATCH_MNT/testdir/extent_file2
>> -Attribute "attr_name2" has a 1024 byte value for SCRATCH_MNT/testdir/extent_file2
>> -Attribute "attr_name3" has a 1024 byte value for SCRATCH_MNT/testdir/extent_file2
>> -Attribute "attr_name1" has a 1024 byte value for SCRATCH_MNT/testdir/extent_file2
>> -attr_name4: 9fd415c49d67afc4b78fad4055a3a376  -
>> +attr_nameXXXX: f4ea5799d72a0a9bf2d56a685c9cba7a  -
>> 
>> attr_set: Input/output error
>> -Could not set "attr_name4" for SCRATCH_MNT/testdir/extent_file3
>> +Could not set "attr_nameXXXX" for SCRATCH_MNT/testdir/extent_file3
>> touch: cannot touch 'SCRATCH_MNT/testdir/extent_file3': Input/output error
>> -Attribute "attr_name4" has a 1025 byte value for SCRATCH_MNT/testdir/extent_file3
>> -Attribute "attr_name2" has a 1024 byte value for SCRATCH_MNT/testdir/extent_file3
>> -Attribute "attr_name3" has a 1024 byte value for SCRATCH_MNT/testdir/extent_file3
>> -Attribute "attr_name1" has a 1024 byte value for SCRATCH_MNT/testdir/extent_file3
>> -attr_name4: 9fd415c49d67afc4b78fad4055a3a376  -
>> +attr_nameXXXX: f4ea5799d72a0a9bf2d56a685c9cba7a  -
>> 
>> attr_set: Input/output error
>> Could not set "attr_name2" for SCRATCH_MNT/testdir/extent_file4
>> touch: cannot touch 'SCRATCH_MNT/testdir/extent_file4': Input/output error
>> -Attribute "attr_name2" has a 65536 byte value for SCRATCH_MNT/testdir/extent_file4
>> -Attribute "attr_name1" has a 1024 byte value for SCRATCH_MNT/testdir/extent_file4
>> attr_name2: 7f6fd1b6d872108bd44bd143cbcdfa19  -
>> 
>> attr_remove: Input/output error
>> Could not remove "attr_name2" for SCRATCH_MNT/testdir/extent_file4
>> touch: cannot touch 'SCRATCH_MNT/testdir/extent_file4': Input/output error
>> -Attribute "attr_name1" has a 1024 byte value for SCRATCH_MNT/testdir/extent_file4
>> attr_name2: d41d8cd98f00b204e9800998ecf8427e  -
>> 
>> attr_set: Input/output error
>> Could not set "attr_name2" for SCRATCH_MNT/testdir/remote_file1
>> touch: cannot touch 'SCRATCH_MNT/testdir/remote_file1': Input/output error
>> -Attribute "attr_name2" has a 1025 byte value for SCRATCH_MNT/testdir/remote_file1
>> -Attribute "attr_name1" has a 65536 byte value for SCRATCH_MNT/testdir/remote_file1
>> attr_name2: 9fd415c49d67afc4b78fad4055a3a376  -
>> 
>> attr_remove: Input/output error
>> Could not remove "attr_name2" for SCRATCH_MNT/testdir/remote_file1
>> touch: cannot touch 'SCRATCH_MNT/testdir/remote_file1': Input/output error
>> -Attribute "attr_name1" has a 65536 byte value for SCRATCH_MNT/testdir/remote_file1
>> attr_name2: d41d8cd98f00b204e9800998ecf8427e  -
>> 
>> attr_set: Input/output error
>> Could not set "attr_name2" for SCRATCH_MNT/testdir/remote_file2
>> touch: cannot touch 'SCRATCH_MNT/testdir/remote_file2': Input/output error
>> -Attribute "attr_name2" has a 65536 byte value for SCRATCH_MNT/testdir/remote_file2
>> -Attribute "attr_name1" has a 65536 byte value for SCRATCH_MNT/testdir/remote_file2
>> attr_name2: 7f6fd1b6d872108bd44bd143cbcdfa19  -
>> 
>> attr_remove: Input/output error
>> Could not remove "attr_name2" for SCRATCH_MNT/testdir/remote_file2
>> touch: cannot touch 'SCRATCH_MNT/testdir/remote_file2': Input/output error
>> -Attribute "attr_name1" has a 65536 byte value for SCRATCH_MNT/testdir/remote_file2
>> attr_name2: d41d8cd98f00b204e9800998ecf8427e  -
>> 
>> attr_set: Input/output error
>> Could not set "attr_name2" for SCRATCH_MNT/testdir/sf_file
>> touch: cannot touch 'SCRATCH_MNT/testdir/sf_file': Input/output error
>> -Attribute "attr_name1" has a 64 byte value for SCRATCH_MNT/testdir/sf_file
>> -Attribute "attr_name2" has a 17 byte value for SCRATCH_MNT/testdir/sf_file
>> attr_name2: 9a6eb1bc9da3c66a9b495dfe2fe8a756  -
>> 
>> attr_set: Input/output error
>> Could not set "attr_name2" for SCRATCH_MNT/testdir/leaf_file
>> touch: cannot touch 'SCRATCH_MNT/testdir/leaf_file': Input/output error
>> -Attribute "attr_name2" has a 257 byte value for SCRATCH_MNT/testdir/leaf_file
>> -Attribute "attr_name3" has a 1024 byte value for SCRATCH_MNT/testdir/leaf_file
>> -Attribute "attr_name1" has a 1024 byte value for SCRATCH_MNT/testdir/leaf_file
>> attr_name2: f4ea5799d72a0a9bf2d56a685c9cba7a  -
>> 
>> attr_set: Input/output error
>> Could not set "attr_name2" for SCRATCH_MNT/testdir/node_file
>> touch: cannot touch 'SCRATCH_MNT/testdir/node_file': Input/output error
>> -Attribute "attr_name2" has a 257 byte value for SCRATCH_MNT/testdir/node_file
>> -Attribute "attr_name1" has a 65536 byte value for SCRATCH_MNT/testdir/node_file
>> attr_name2: f4ea5799d72a0a9bf2d56a685c9cba7a  -
>> 
>> *** done
>> -- 
>> 2.25.1
>>

diff --git a/tests/xfs/018 b/tests/xfs/018
index 041a3b24..323279b5 100755
--- a/tests/xfs/018
+++ b/tests/xfs/018
@@ -47,7 +47,8 @@  test_attr_replay()
 	touch $testfile
 
 	# Verify attr recovery
-	$ATTR_PROG -l $testfile | _filter_scratch
+	$ATTR_PROG -l $testfile >> $seqres.full
+	echo "Checking contents of $attr_name" >> $seqres.full
 	echo -n "$attr_name: "
 	$ATTR_PROG -q -g $attr_name $testfile 2> /dev/null | md5sum;
 
@@ -98,6 +99,9 @@  attr64k="$attr32k$attr32k"
 echo "*** mkfs"
 _scratch_mkfs >/dev/null
 
+blk_sz=$(_scratch_xfs_get_sb_field blocksize)
+multiplier=$(( $blk_sz / 276 )) # 256 + 20 to account for attr name
+
 echo "*** mount FS"
 _scratch_mount
 
@@ -140,12 +144,12 @@  test_attr_replay extent_file1 "attr_name2" $attr1k "s" "larp"
 test_attr_replay extent_file1 "attr_name2" $attr1k "r" "larp"
 
 # extent, inject error on split
-create_test_file extent_file2 3 $attr1k
-test_attr_replay extent_file2 "attr_name4" $attr1k "s" "da_leaf_split"
+create_test_file extent_file2 $multiplier $attr256
+test_attr_replay extent_file2 "attr_nameXXXX" $attr256 "s" "da_leaf_split"
 
 # extent, inject error on fork transition
-create_test_file extent_file3 3 $attr1k
-test_attr_replay extent_file3 "attr_name4" $attr1k "s" "attr_leaf_to_node"
+create_test_file extent_file3 $multiplier $attr256
+test_attr_replay extent_file3 "attr_nameXXXX" $attr256 "s" "attr_leaf_to_node"
 
 # extent, remote
 create_test_file extent_file4 1 $attr1k
diff --git a/tests/xfs/018.out b/tests/xfs/018.out
index 022b0ca3..57dc448a 100644
--- a/tests/xfs/018.out
+++ b/tests/xfs/018.out
@@ -4,7 +4,6 @@  QA output created by 018
 attr_set: Input/output error
 Could not set "attr_name" for SCRATCH_MNT/testdir/empty_file1
 touch: cannot touch 'SCRATCH_MNT/testdir/empty_file1': Input/output error
-Attribute "attr_name" has a 65 byte value for SCRATCH_MNT/testdir/empty_file1
 attr_name: cfbe2a33be4601d2b655d099a18378fc  -
 
 attr_remove: Input/output error
@@ -15,7 +14,6 @@  attr_name: d41d8cd98f00b204e9800998ecf8427e  -
 attr_set: Input/output error
 Could not set "attr_name" for SCRATCH_MNT/testdir/empty_file2
 touch: cannot touch 'SCRATCH_MNT/testdir/empty_file2': Input/output error
-Attribute "attr_name" has a 1025 byte value for SCRATCH_MNT/testdir/empty_file2
 attr_name: 9fd415c49d67afc4b78fad4055a3a376  -
 
 attr_remove: Input/output error
@@ -26,7 +24,6 @@  attr_name: d41d8cd98f00b204e9800998ecf8427e  -
 attr_set: Input/output error
 Could not set "attr_name" for SCRATCH_MNT/testdir/empty_file3
 touch: cannot touch 'SCRATCH_MNT/testdir/empty_file3': Input/output error
-Attribute "attr_name" has a 65536 byte value for SCRATCH_MNT/testdir/empty_file3
 attr_name: 7f6fd1b6d872108bd44bd143cbcdfa19  -
 
 attr_remove: Input/output error
@@ -37,132 +34,96 @@  attr_name: d41d8cd98f00b204e9800998ecf8427e  -
 attr_set: Input/output error
 Could not set "attr_name2" for SCRATCH_MNT/testdir/inline_file1
 touch: cannot touch 'SCRATCH_MNT/testdir/inline_file1': Input/output error
-Attribute "attr_name1" has a 16 byte value for SCRATCH_MNT/testdir/inline_file1
-Attribute "attr_name2" has a 65 byte value for SCRATCH_MNT/testdir/inline_file1
 attr_name2: cfbe2a33be4601d2b655d099a18378fc  -
 
 attr_remove: Input/output error
 Could not remove "attr_name2" for SCRATCH_MNT/testdir/inline_file1
 touch: cannot touch 'SCRATCH_MNT/testdir/inline_file1': Input/output error
-Attribute "attr_name1" has a 16 byte value for SCRATCH_MNT/testdir/inline_file1
 attr_name2: d41d8cd98f00b204e9800998ecf8427e  -
 
 attr_set: Input/output error
 Could not set "attr_name2" for SCRATCH_MNT/testdir/inline_file2
 touch: cannot touch 'SCRATCH_MNT/testdir/inline_file2': Input/output error
-Attribute "attr_name2" has a 1025 byte value for SCRATCH_MNT/testdir/inline_file2
-Attribute "attr_name1" has a 16 byte value for SCRATCH_MNT/testdir/inline_file2
 attr_name2: 9fd415c49d67afc4b78fad4055a3a376  -
 
 attr_remove: Input/output error
 Could not remove "attr_name2" for SCRATCH_MNT/testdir/inline_file2
 touch: cannot touch 'SCRATCH_MNT/testdir/inline_file2': Input/output error
-Attribute "attr_name1" has a 16 byte value for SCRATCH_MNT/testdir/inline_file2
 attr_name2: d41d8cd98f00b204e9800998ecf8427e  -
 
 attr_set: Input/output error
 Could not set "attr_name2" for SCRATCH_MNT/testdir/inline_file3
 touch: cannot touch 'SCRATCH_MNT/testdir/inline_file3': Input/output error
-Attribute "attr_name2" has a 65536 byte value for SCRATCH_MNT/testdir/inline_file3
-Attribute "attr_name1" has a 16 byte value for SCRATCH_MNT/testdir/inline_file3
 attr_name2: 7f6fd1b6d872108bd44bd143cbcdfa19  -
 
 attr_remove: Input/output error
 Could not remove "attr_name2" for SCRATCH_MNT/testdir/inline_file3
 touch: cannot touch 'SCRATCH_MNT/testdir/inline_file3': Input/output error
-Attribute "attr_name1" has a 16 byte value for SCRATCH_MNT/testdir/inline_file3
 attr_name2: d41d8cd98f00b204e9800998ecf8427e  -
 
 attr_set: Input/output error
 Could not set "attr_name2" for SCRATCH_MNT/testdir/extent_file1
 touch: cannot touch 'SCRATCH_MNT/testdir/extent_file1': Input/output error
-Attribute "attr_name2" has a 1025 byte value for SCRATCH_MNT/testdir/extent_file1
-Attribute "attr_name1" has a 1024 byte value for SCRATCH_MNT/testdir/extent_file1
 attr_name2: 9fd415c49d67afc4b78fad4055a3a376  -
 
 attr_remove: Input/output error
 Could not remove "attr_name2" for SCRATCH_MNT/testdir/extent_file1
 touch: cannot touch 'SCRATCH_MNT/testdir/extent_file1': Input/output error
-Attribute "attr_name1" has a 1024 byte value for SCRATCH_MNT/testdir/extent_file1
 attr_name2: d41d8cd98f00b204e9800998ecf8427e  -
 
 attr_set: Input/output error
-Could not set "attr_name4" for SCRATCH_MNT/testdir/extent_file2
+Could not set "attr_nameXXXX" for SCRATCH_MNT/testdir/extent_file2
 touch: cannot touch 'SCRATCH_MNT/testdir/extent_file2': Input/output error
-Attribute "attr_name4" has a 1025 byte value for SCRATCH_MNT/testdir/extent_file2
-Attribute "attr_name2" has a 1024 byte value for SCRATCH_MNT/testdir/extent_file2
-Attribute "attr_name3" has a 1024 byte value for SCRATCH_MNT/testdir/extent_file2
-Attribute "attr_name1" has a 1024 byte value for SCRATCH_MNT/testdir/extent_file2
-attr_name4: 9fd415c49d67afc4b78fad4055a3a376  -
+attr_nameXXXX: f4ea5799d72a0a9bf2d56a685c9cba7a  -
 
 attr_set: Input/output error
-Could not set "attr_name4" for SCRATCH_MNT/testdir/extent_file3
+Could not set "attr_nameXXXX" for SCRATCH_MNT/testdir/extent_file3
 touch: cannot touch 'SCRATCH_MNT/testdir/extent_file3': Input/output error
-Attribute "attr_name4" has a 1025 byte value for SCRATCH_MNT/testdir/extent_file3
-Attribute "attr_name2" has a 1024 byte value for SCRATCH_MNT/testdir/extent_file3
-Attribute "attr_name3" has a 1024 byte value for SCRATCH_MNT/testdir/extent_file3
-Attribute "attr_name1" has a 1024 byte value for SCRATCH_MNT/testdir/extent_file3
-attr_name4: 9fd415c49d67afc4b78fad4055a3a376  -
+attr_nameXXXX: f4ea5799d72a0a9bf2d56a685c9cba7a  -
 
 attr_set: Input/output error
 Could not set "attr_name2" for SCRATCH_MNT/testdir/extent_file4
 touch: cannot touch 'SCRATCH_MNT/testdir/extent_file4': Input/output error
-Attribute "attr_name2" has a 65536 byte value for SCRATCH_MNT/testdir/extent_file4
-Attribute "attr_name1" has a 1024 byte value for SCRATCH_MNT/testdir/extent_file4
 attr_name2: 7f6fd1b6d872108bd44bd143cbcdfa19  -
 
 attr_remove: Input/output error
 Could not remove "attr_name2" for SCRATCH_MNT/testdir/extent_file4
 touch: cannot touch 'SCRATCH_MNT/testdir/extent_file4': Input/output error
-Attribute "attr_name1" has a 1024 byte value for SCRATCH_MNT/testdir/extent_file4
 attr_name2: d41d8cd98f00b204e9800998ecf8427e  -
 
 attr_set: Input/output error
 Could not set "attr_name2" for SCRATCH_MNT/testdir/remote_file1
 touch: cannot touch 'SCRATCH_MNT/testdir/remote_file1': Input/output error
-Attribute "attr_name2" has a 1025 byte value for SCRATCH_MNT/testdir/remote_file1
-Attribute "attr_name1" has a 65536 byte value for SCRATCH_MNT/testdir/remote_file1
 attr_name2: 9fd415c49d67afc4b78fad4055a3a376  -
 
 attr_remove: Input/output error
 Could not remove "attr_name2" for SCRATCH_MNT/testdir/remote_file1
 touch: cannot touch 'SCRATCH_MNT/testdir/remote_file1': Input/output error
-Attribute "attr_name1" has a 65536 byte value for SCRATCH_MNT/testdir/remote_file1
 attr_name2: d41d8cd98f00b204e9800998ecf8427e  -
 
 attr_set: Input/output error
 Could not set "attr_name2" for SCRATCH_MNT/testdir/remote_file2
 touch: cannot touch 'SCRATCH_MNT/testdir/remote_file2': Input/output error
-Attribute "attr_name2" has a 65536 byte value for SCRATCH_MNT/testdir/remote_file2
-Attribute "attr_name1" has a 65536 byte value for SCRATCH_MNT/testdir/remote_file2
 attr_name2: 7f6fd1b6d872108bd44bd143cbcdfa19  -
 
 attr_remove: Input/output error
 Could not remove "attr_name2" for SCRATCH_MNT/testdir/remote_file2
 touch: cannot touch 'SCRATCH_MNT/testdir/remote_file2': Input/output error
-Attribute "attr_name1" has a 65536 byte value for SCRATCH_MNT/testdir/remote_file2
 attr_name2: d41d8cd98f00b204e9800998ecf8427e  -
 
 attr_set: Input/output error
 Could not set "attr_name2" for SCRATCH_MNT/testdir/sf_file
 touch: cannot touch 'SCRATCH_MNT/testdir/sf_file': Input/output error
-Attribute "attr_name1" has a 64 byte value for SCRATCH_MNT/testdir/sf_file
-Attribute "attr_name2" has a 17 byte value for SCRATCH_MNT/testdir/sf_file
 attr_name2: 9a6eb1bc9da3c66a9b495dfe2fe8a756  -
 
 attr_set: Input/output error
 Could not set "attr_name2" for SCRATCH_MNT/testdir/leaf_file
 touch: cannot touch 'SCRATCH_MNT/testdir/leaf_file': Input/output error
-Attribute "attr_name2" has a 257 byte value for SCRATCH_MNT/testdir/leaf_file
-Attribute "attr_name3" has a 1024 byte value for SCRATCH_MNT/testdir/leaf_file
-Attribute "attr_name1" has a 1024 byte value for SCRATCH_MNT/testdir/leaf_file
 attr_name2: f4ea5799d72a0a9bf2d56a685c9cba7a  -
 
 attr_set: Input/output error
 Could not set "attr_name2" for SCRATCH_MNT/testdir/node_file
 touch: cannot touch 'SCRATCH_MNT/testdir/node_file': Input/output error
-Attribute "attr_name2" has a 257 byte value for SCRATCH_MNT/testdir/node_file
-Attribute "attr_name1" has a 65536 byte value for SCRATCH_MNT/testdir/node_file
 attr_name2: f4ea5799d72a0a9bf2d56a685c9cba7a  -
 
 *** done

[v2] xfs/018: fix LARP testing for small block sizes

Commit Message

Comments

Patch