[PATCH] fstests: fix flaky device name in _cleanup_flakey

[PATCH] fstests: fix flaky device name in _cleanup_flakey

[Anand Jain]

There is no device named flakey-test, which _cleanup_flakey() currently
uses. The actual device name is stored in $FLAKEY_NAME and is set to
flakey-test.$seq. Use $FLAKEY_NAME instead.

Signed-off-by: Anand Jain <asj@kernel.org>
---
 (apply this on top of the patchset
	'stop overriding SCRATCH_{,LOG,RT}DEV v2')
 common/dmflakey | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/dmflakey b/common/dmflakey
index cb0359901c16..6ac666f5b61e 100644
--- a/common/dmflakey
+++ b/common/dmflakey
@@ -76,7 +76,7 @@ _cleanup_flakey()
 	# otherwise the umount will hang
 	test -n "$NON_FLAKEY_LOGDEV" && $DMSETUP_PROG resume $FLAKEY_LOGNAME &> /dev/null
 	test -n "$NON_FLAKEY_RTDEV" && $DMSETUP_PROG resume $FLAKEY_RTNAME &> /dev/null
-	test -n "$NON_FLAKEY_DEV" && $DMSETUP_PROG resume flakey-test > /dev/null 2>&1
+	test -n "$NON_FLAKEY_DEV" && $DMSETUP_PROG resume $FLAKEY_NAME &> /dev/null
 
 	_unmount $SCRATCH_MNT > /dev/null 2>&1
 
-- 
2.43.0

Re: [PATCH] fstests: fix flaky device name in _cleanup_flakey

[Darrick J. Wong]

On Thu, Dec 18, 2025 at 01:00:22AM +0800, Anand Jain wrote:
> There is no device named flakey-test, which _cleanup_flakey() currently
> uses. The actual device name is stored in $FLAKEY_NAME and is set to
> flakey-test.$seq. Use $FLAKEY_NAME instead.
> 
> Signed-off-by: Anand Jain <asj@kernel.org>

Ugh, still finding obvious bugs a year later <grumble>

Cc: <fstests@vger.kernel.org> # v2024.12.08
Fixes: 603030dee015ba ("fstests: per-test dmflakey instances")

Thanks for spotting this, Anand.

Reviewed-by: "Darrick J. Wong" <djwong@kernel.org>

--D

> ---
>  (apply this on top of the patchset
> 	'stop overriding SCRATCH_{,LOG,RT}DEV v2')
>  common/dmflakey | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/common/dmflakey b/common/dmflakey
> index cb0359901c16..6ac666f5b61e 100644
> --- a/common/dmflakey
> +++ b/common/dmflakey
> @@ -76,7 +76,7 @@ _cleanup_flakey()
>  	# otherwise the umount will hang
>  	test -n "$NON_FLAKEY_LOGDEV" && $DMSETUP_PROG resume $FLAKEY_LOGNAME &> /dev/null
>  	test -n "$NON_FLAKEY_RTDEV" && $DMSETUP_PROG resume $FLAKEY_RTNAME &> /dev/null
> -	test -n "$NON_FLAKEY_DEV" && $DMSETUP_PROG resume flakey-test > /dev/null 2>&1
> +	test -n "$NON_FLAKEY_DEV" && $DMSETUP_PROG resume $FLAKEY_NAME &> /dev/null
>  
>  	_unmount $SCRATCH_MNT > /dev/null 2>&1
>  
> -- 
> 2.43.0
> 
> 

Re: [PATCH] fstests: fix flaky device name in _cleanup_flakey

[Christoph Hellwig]

On Thu, Dec 18, 2025 at 01:00:22AM +0800, Anand Jain wrote:
> There is no device named flakey-test, which _cleanup_flakey() currently
> uses. The actual device name is stored in $FLAKEY_NAME and is set to
> flakey-test.$seq. Use $FLAKEY_NAME instead.

This looks good, but I vaguely remember fixing this up on the go, and
seeing random hangs. While that could have been me fat-fingering
something,  please run all the tests using this first to make sure it
works just to be safe.

Re: [PATCH] fstests: fix flaky device name in _cleanup_flakey

[Anand Jain]

On 18/12/25 13:29, Christoph Hellwig wrote:
> On Thu, Dec 18, 2025 at 01:00:22AM +0800, Anand Jain wrote:
>> There is no device named flakey-test, which _cleanup_flakey() currently
>> uses. The actual device name is stored in $FLAKEY_NAME and is set to
>> flakey-test.$seq. Use $FLAKEY_NAME instead.
> 
> This looks good, but I vaguely remember fixing this up on the go, and
> seeing random hangs. While that could have been me fat-fingering
> something,  please run all the tests using this first to make sure it
> works just to be safe.

Yeah, I've already run the tests that fall under the
_require_dm_target flakey, and they have no regression
with this. I reran them again just now to be safe.

Happy to run any specific set/test case if you'd
like me to try.

Re: [PATCH] fstests: fix flaky device name in _cleanup_flakey

[Christoph Hellwig]

On Thu, Dec 18, 2025 at 02:11:22PM +0800, Anand Jain wrote:
> 
> 
> On 18/12/25 13:29, Christoph Hellwig wrote:
> > On Thu, Dec 18, 2025 at 01:00:22AM +0800, Anand Jain wrote:
> > > There is no device named flakey-test, which _cleanup_flakey() currently
> > > uses. The actual device name is stored in $FLAKEY_NAME and is set to
> > > flakey-test.$seq. Use $FLAKEY_NAME instead.
> > 
> > This looks good, but I vaguely remember fixing this up on the go, and
> > seeing random hangs. While that could have been me fat-fingering
> > something,  please run all the tests using this first to make sure it
> > works just to be safe.
> 
> Yeah, I've already run the tests that fall under the
> _require_dm_target flakey, and they have no regression
> with this. I reran them again just now to be safe.
> 
> Happy to run any specific set/test case if you'd
> like me to try.

Nah, looks good:

Reviewed-by: Christoph Hellwig <hch@lst.de>