* add device removal test v2
@ 2023-07-11 10:09 Christoph Hellwig
2023-07-11 10:09 ` [PATCH 1/2] generic: add a test for device removal with dirty data Christoph Hellwig
2023-07-11 10:09 ` [PATCH 2/2] generic: add a test for device removal without " Christoph Hellwig
0 siblings, 2 replies; 9+ messages in thread
From: Christoph Hellwig @ 2023-07-11 10:09 UTC (permalink / raw)
To: fstests
Hi all,
this series adds two tests for removing a device underneath the
file system. This covers the new shutdown handling series I'm
posting.
Changes since v1:
- renumbered the tests
- add a check that the tests are only run on block based file systems
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 1/2] generic: add a test for device removal with dirty data
2023-07-11 10:09 add device removal test v2 Christoph Hellwig
@ 2023-07-11 10:09 ` Christoph Hellwig
2023-07-18 10:34 ` Zorro Lang
2023-07-23 4:50 ` [PATCH] " Zorro Lang
2023-07-11 10:09 ` [PATCH 2/2] generic: add a test for device removal without " Christoph Hellwig
1 sibling, 2 replies; 9+ messages in thread
From: Christoph Hellwig @ 2023-07-11 10:09 UTC (permalink / raw)
To: fstests
Test the removal of the underlying device when the file system still
has dirty data.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
tests/generic/730 | 57 +++++++++++++++++++++++++++++++++++++++++++
tests/generic/730.out | 2 ++
2 files changed, 59 insertions(+)
create mode 100755 tests/generic/730
create mode 100644 tests/generic/730.out
diff --git a/tests/generic/730 b/tests/generic/730
new file mode 100755
index 00000000..6fba31fc
--- /dev/null
+++ b/tests/generic/730
@@ -0,0 +1,57 @@
+#! /bin/bash
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (c) 2015 Red Hat Inc. All Rights Reserved.
+# Copyright (c) 2023 Christoph Hellwig
+#
+# Test proper file system shut down when the block device is removed underneath
+# and there is dirty data.
+#
+. ./common/preamble
+_begin_fstest auto quick
+
+_cleanup()
+{
+ cd /
+ $UMOUNT_PROG $SCRATCH_MNT >>$seqres.full 2>&1
+ _put_scsi_debug_dev
+ rm -f $tmp.*
+}
+
+. ./common/filter
+. ./common/scsi_debug
+
+_supported_fs generic
+
+# We don't actually use the test device, but we need a block based fs
+_require_test
+_require_block_device $TEST_DEV
+_require_scsi_debug
+
+physical=`blockdev --getpbsz $SCRATCH_DEV`
+logical=`blockdev --getss $SCRATCH_DEV`
+
+SCSI_DEBUG_DEV=`_get_scsi_debug_dev ${physical:-512} ${logical:-512} 0 300`
+test -b "$SCSI_DEBUG_DEV" || _notrun "Failed to initialize scsi debug device"
+echo "SCSI debug device $SCSI_DEBUG_DEV" >>$seqres.full
+
+_mkfs_dev $SCSI_DEBUG_DEV
+
+_mount $SCSI_DEBUG_DEV $SCRATCH_MNT
+
+# create a test file
+$XFS_IO_PROG -f -c "pwrite 0 1M" $SCRATCH_MNT/testfile >>$seqres.full
+
+# open a file descriptor for reading the file
+exec 3< $SCRATCH_MNT/testfile
+
+# delete the scsi debug device while it still has dirty data
+echo 1 > /sys/block/`_short_dev $SCSI_DEBUG_DEV`/device/delete
+
+# try to read from the file, which should give us -EIO
+cat <&3 > /dev/null
+
+# close the file descriptor to not block unmount
+exec 3<&-
+
+status=0
+exit
diff --git a/tests/generic/730.out b/tests/generic/730.out
new file mode 100644
index 00000000..79e96db8
--- /dev/null
+++ b/tests/generic/730.out
@@ -0,0 +1,2 @@
+QA output created by 730
+cat: -: Input/output error
--
2.39.2
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH 1/2] generic: add a test for device removal with dirty data
2023-07-11 10:09 ` [PATCH 1/2] generic: add a test for device removal with dirty data Christoph Hellwig
@ 2023-07-18 10:34 ` Zorro Lang
2023-07-23 4:50 ` [PATCH] " Zorro Lang
1 sibling, 0 replies; 9+ messages in thread
From: Zorro Lang @ 2023-07-18 10:34 UTC (permalink / raw)
To: Christoph Hellwig; +Cc: fstests
On Tue, Jul 11, 2023 at 12:09:30PM +0200, Christoph Hellwig wrote:
> Test the removal of the underlying device when the file system still
> has dirty data.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
Thanks this new version! Sorry for the late review. Most of the cases look
good to me, just a bit picky reveiw points as below. (Same to patch 2/2).
> tests/generic/730 | 57 +++++++++++++++++++++++++++++++++++++++++++
> tests/generic/730.out | 2 ++
> 2 files changed, 59 insertions(+)
> create mode 100755 tests/generic/730
> create mode 100644 tests/generic/730.out
>
> diff --git a/tests/generic/730 b/tests/generic/730
> new file mode 100755
> index 00000000..6fba31fc
> --- /dev/null
> +++ b/tests/generic/730
> @@ -0,0 +1,57 @@
> +#! /bin/bash
> +# SPDX-License-Identifier: GPL-2.0
> +# Copyright (c) 2015 Red Hat Inc. All Rights Reserved.
> +# Copyright (c) 2023 Christoph Hellwig
> +#
> +# Test proper file system shut down when the block device is removed underneath
> +# and there is dirty data.
> +#
> +. ./common/preamble
> +_begin_fstest auto quick
> +
> +_cleanup()
> +{
> + cd /
> + $UMOUNT_PROG $SCRATCH_MNT >>$seqres.full 2>&1
> + _put_scsi_debug_dev
> + rm -f $tmp.*
> +}
> +
> +. ./common/filter
> +. ./common/scsi_debug
> +
> +_supported_fs generic
> +
> +# We don't actually use the test device, but we need a block based fs
> +_require_test
> +_require_block_device $TEST_DEV
> +_require_scsi_debug
> +
> +physical=`blockdev --getpbsz $SCRATCH_DEV`
> +logical=`blockdev --getss $SCRATCH_DEV`
There's not _require_scratch, so I doubt we should use SCRATCH_DEV directly.
How about use TEST_DEV (due to this case calls _require_test) ?
> +
> +SCSI_DEBUG_DEV=`_get_scsi_debug_dev ${physical:-512} ${logical:-512} 0 300`
> +test -b "$SCSI_DEBUG_DEV" || _notrun "Failed to initialize scsi debug device"
> +echo "SCSI debug device $SCSI_DEBUG_DEV" >>$seqres.full
> +
> +_mkfs_dev $SCSI_DEBUG_DEV
How about _fail if it fails?
> +
> +_mount $SCSI_DEBUG_DEV $SCRATCH_MNT
I don't know if mount can return non-zero without any output. If you hope to
check the return status, you can use run_check() in common/rc.
> +
> +# create a test file
> +$XFS_IO_PROG -f -c "pwrite 0 1M" $SCRATCH_MNT/testfile >>$seqres.full
> +
> +# open a file descriptor for reading the file
> +exec 3< $SCRATCH_MNT/testfile
> +
> +# delete the scsi debug device while it still has dirty data
> +echo 1 > /sys/block/`_short_dev $SCSI_DEBUG_DEV`/device/delete
Is this file "/sys/block/`_short_dev $SCSI_DEBUG_DEV`/device/delete" 100%
supported? Or we'd better to _notrun, not report pass.
(BTW, the `command` and $(command) are both work, but the $() is more recommended
in fstests (not mandatory:). If both formats are good, choose $(command).
http://mywiki.wooledge.org/BashFAQ/082)
Thanks,
Zorro
> +
> +# try to read from the file, which should give us -EIO
> +cat <&3 > /dev/null
> +
> +# close the file descriptor to not block unmount
> +exec 3<&-
> +
> +status=0
> +exit
> diff --git a/tests/generic/730.out b/tests/generic/730.out
> new file mode 100644
> index 00000000..79e96db8
> --- /dev/null
> +++ b/tests/generic/730.out
> @@ -0,0 +1,2 @@
> +QA output created by 730
> +cat: -: Input/output error
> --
> 2.39.2
>
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCH] generic: add a test for device removal with dirty data
2023-07-11 10:09 ` [PATCH 1/2] generic: add a test for device removal with dirty data Christoph Hellwig
2023-07-18 10:34 ` Zorro Lang
@ 2023-07-23 4:50 ` Zorro Lang
2023-07-24 13:32 ` Christoph Hellwig
1 sibling, 1 reply; 9+ messages in thread
From: Zorro Lang @ 2023-07-23 4:50 UTC (permalink / raw)
To: fstests; +Cc: hch
From: Christoph Hellwig <hch@lst.de>
Test the removal of the underlying device when the file system still
has dirty data.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
Hi Christoph,
I'd like to help this patchset to catch this or next fstests release. So I
changed this patch a bit, if you feel good, I'll merge this patch as below.
(Same to the 2nd patch).
Change logs:
1) Replace SCRATCH_DEV with TEST_DEV, replace SCRATCH_MNT with SCSI_DEBUG_MNT
which is a directory in TEST_DIR, due to we don't call _require_scratch
in this case.
2) Call _fail if _mkfs_dev or _mount fails
Thanks,
Zorro
tests/generic/730 | 59 +++++++++++++++++++++++++++++++++++++++++++
tests/generic/730.out | 2 ++
2 files changed, 61 insertions(+)
create mode 100755 tests/generic/730
create mode 100644 tests/generic/730.out
diff --git a/tests/generic/730 b/tests/generic/730
new file mode 100755
index 00000000..7886b38d
--- /dev/null
+++ b/tests/generic/730
@@ -0,0 +1,59 @@
+#! /bin/bash
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (c) 2015 Red Hat Inc. All Rights Reserved.
+# Copyright (c) 2023 Christoph Hellwig
+#
+# Test proper file system shut down when the block device is removed underneath
+# and there is dirty data.
+#
+. ./common/preamble
+_begin_fstest auto quick
+
+_cleanup()
+{
+ cd /
+ $UMOUNT_PROG $SCSI_DEBUG_MNT >>$seqres.full 2>&1
+ _put_scsi_debug_dev
+ rm -r -f $tmp.*
+}
+
+. ./common/filter
+. ./common/scsi_debug
+
+_supported_fs generic
+
+# We don't actually use the test device, but we need a block based fs
+_require_test
+_require_block_device $TEST_DEV
+_require_scsi_debug
+
+physical=`blockdev --getpbsz $TEST_DEV`
+logical=`blockdev --getss $TEST_DEV`
+
+SCSI_DEBUG_DEV=`_get_scsi_debug_dev ${physical:-512} ${logical:-512} 0 300`
+test -b "$SCSI_DEBUG_DEV" || _notrun "Failed to initialize scsi debug device"
+echo "SCSI debug device $SCSI_DEBUG_DEV" >>$seqres.full
+
+_mkfs_dev $SCSI_DEBUG_DEV || _fail "make $FSTYP on $SCSI_DEBUG_DEV"
+SCSI_DEBUG_MNT="$TEST_DIR/scsi_debug_$seq"
+rm -rf $SCSI_DEBUG_MNT
+mkdir $SCSI_DEBUG_MNT
+run_check _mount $SCSI_DEBUG_DEV $SCSI_DEBUG_MNT
+
+# create a test file
+$XFS_IO_PROG -f -c "pwrite 0 1M" $SCSI_DEBUG_MNT/testfile >>$seqres.full
+
+# open a file descriptor for reading the file
+exec 3< $SCSI_DEBUG_MNT/testfile
+
+# delete the scsi debug device while it still has dirty data
+echo 1 > /sys/block/$(_short_dev $SCSI_DEBUG_DEV)/device/delete
+
+# try to read from the file, which should give us -EIO
+cat <&3 > /dev/null
+
+# close the file descriptor to not block unmount
+exec 3<&-
+
+status=0
+exit
diff --git a/tests/generic/730.out b/tests/generic/730.out
new file mode 100644
index 00000000..79e96db8
--- /dev/null
+++ b/tests/generic/730.out
@@ -0,0 +1,2 @@
+QA output created by 730
+cat: -: Input/output error
--
2.40.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH] generic: add a test for device removal with dirty data
2023-07-23 4:50 ` [PATCH] " Zorro Lang
@ 2023-07-24 13:32 ` Christoph Hellwig
0 siblings, 0 replies; 9+ messages in thread
From: Christoph Hellwig @ 2023-07-24 13:32 UTC (permalink / raw)
To: Zorro Lang; +Cc: fstests, hch
On Sun, Jul 23, 2023 at 12:50:17PM +0800, Zorro Lang wrote:
> I'd like to help this patchset to catch this or next fstests release. So I
> changed this patch a bit, if you feel good, I'll merge this patch as below.
> (Same to the 2nd patch).
I've actually got a few other changes locally nad plant to send it out.
> Change logs:
> 1) Replace SCRATCH_DEV with TEST_DEV, replace SCRATCH_MNT with SCSI_DEBUG_MNT
> which is a directory in TEST_DIR, due to we don't call _require_scratch
> in this case.
The SCSI_DEBUG_MNT change is fine. The SCRATCH_DEV stuff I think we don't
need at all, after all the sector size doesn't really matter for this
test, so I've just dropped it.
> 2) Call _fail if _mkfs_dev or _mount fails
Shouldn't the mkfs side also use run_check ?
Btw, your cleanups should also go into generic/108 from where I took
the scsi_debug boilerplate.
I'll resend later today, also incorporating your changes.
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 2/2] generic: add a test for device removal without dirty data
2023-07-11 10:09 add device removal test v2 Christoph Hellwig
2023-07-11 10:09 ` [PATCH 1/2] generic: add a test for device removal with dirty data Christoph Hellwig
@ 2023-07-11 10:09 ` Christoph Hellwig
1 sibling, 0 replies; 9+ messages in thread
From: Christoph Hellwig @ 2023-07-11 10:09 UTC (permalink / raw)
To: fstests
Test the removal of the underlying device when the file system still
does not have dirty data.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
tests/generic/731 | 58 +++++++++++++++++++++++++++++++++++++++++++
tests/generic/731.out | 2 ++
2 files changed, 60 insertions(+)
create mode 100755 tests/generic/731
create mode 100644 tests/generic/731.out
diff --git a/tests/generic/731 b/tests/generic/731
new file mode 100755
index 00000000..4a6a2355
--- /dev/null
+++ b/tests/generic/731
@@ -0,0 +1,58 @@
+#! /bin/bash
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (c) 2015 Red Hat Inc. All Rights Reserved.
+# Copyright (c) 2023 Christoph Hellwig
+#
+# Test proper file system shut down when the block device is removed underneath
+# and it has no dirty data.
+#
+#
+. ./common/preamble
+_begin_fstest auto quick
+
+_cleanup()
+{
+ cd /
+ $UMOUNT_PROG $SCRATCH_MNT >>$seqres.full 2>&1
+ _put_scsi_debug_dev
+ rm -f $tmp.*
+}
+
+. ./common/filter
+. ./common/scsi_debug
+
+# We don't actually use the test device, but we need a block based fs
+_require_test
+_require_block_device $TEST_DEV
+_supported_fs generic
+_require_scsi_debug
+
+physical=`blockdev --getpbsz $SCRATCH_DEV`
+logical=`blockdev --getss $SCRATCH_DEV`
+
+SCSI_DEBUG_DEV=`_get_scsi_debug_dev ${physical:-512} ${logical:-512} 0 300`
+test -b "$SCSI_DEBUG_DEV" || _notrun "Failed to initialize scsi debug device"
+echo "SCSI debug device $SCSI_DEBUG_DEV" >>$seqres.full
+
+_mkfs_dev $SCSI_DEBUG_DEV
+
+_mount $SCSI_DEBUG_DEV $SCRATCH_MNT
+
+# create a test file
+$XFS_IO_PROG -f -c "pwrite 0 1M" -c "fsync" $SCRATCH_MNT/testfile >>$seqres.full
+
+# open a file descriptor for reading the file
+exec 3< $SCRATCH_MNT/testfile
+
+# drop all caches and delete the scsi debug device
+echo 3 > /proc/sys/vm/drop_caches
+echo 1 > /sys/block/`_short_dev $SCSI_DEBUG_DEV`/device/delete
+
+# try to read from the file, which should give us -EIO
+cat <&3 > /dev/null
+
+# close the file descriptor to not block unmount
+exec 3<&-
+
+status=0
+exit
diff --git a/tests/generic/731.out b/tests/generic/731.out
new file mode 100644
index 00000000..102c0522
--- /dev/null
+++ b/tests/generic/731.out
@@ -0,0 +1,2 @@
+QA output created by 731
+cat: -: Input/output error
--
2.39.2
^ permalink raw reply related [flat|nested] 9+ messages in thread
* add device removal test v3
@ 2023-07-24 15:29 Christoph Hellwig
2023-07-24 15:29 ` [PATCH 2/2] generic: add a test for device removal without dirty data Christoph Hellwig
0 siblings, 1 reply; 9+ messages in thread
From: Christoph Hellwig @ 2023-07-24 15:29 UTC (permalink / raw)
To: fstests
Hi all,
this series adds two tests for removing a device underneath the
file system. This covers the new shutdown handling series I'm
posting.
Changes since v2:
- don't look for specific logical/physical block sizes on SCRATCH_DEV
- use run_check (Zorro Lang)
- use SCSI_DEBUG_MNT instead of SCRATCH_DEV (Zorro Lang)
Changes since v1:
- renumbered the tests
- add a check that the tests are only run on block based file systems
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 2/2] generic: add a test for device removal without dirty data
2023-07-24 15:29 add device removal test v3 Christoph Hellwig
@ 2023-07-24 15:29 ` Christoph Hellwig
2023-07-25 15:33 ` Darrick J. Wong
0 siblings, 1 reply; 9+ messages in thread
From: Christoph Hellwig @ 2023-07-24 15:29 UTC (permalink / raw)
To: fstests
Test the removal of the underlying device when the file system still
does not have dirty data.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
tests/generic/731 | 58 +++++++++++++++++++++++++++++++++++++++++++
tests/generic/731.out | 2 ++
2 files changed, 60 insertions(+)
create mode 100755 tests/generic/731
create mode 100644 tests/generic/731.out
diff --git a/tests/generic/731 b/tests/generic/731
new file mode 100755
index 00000000..e1400d06
--- /dev/null
+++ b/tests/generic/731
@@ -0,0 +1,58 @@
+#! /bin/bash
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (c) 2015 Red Hat Inc. All Rights Reserved.
+# Copyright (c) 2023 Christoph Hellwig
+#
+# Test proper file system shut down when the block device is removed underneath
+# and it has no dirty data.
+#
+#
+. ./common/preamble
+_begin_fstest auto quick
+
+_cleanup()
+{
+ cd /
+ $UMOUNT_PROG $SCSI_DEBUG_MNT >>$seqres.full 2>&1
+ _put_scsi_debug_dev
+ rm -f $tmp.*
+}
+
+. ./common/filter
+. ./common/scsi_debug
+
+# We don't actually use the test device, but we need a block based fs
+_require_test
+_require_block_device $TEST_DEV
+_supported_fs generic
+_require_scsi_debug
+
+SCSI_DEBUG_DEV=`_get_scsi_debug_dev 512 512 0 256`
+test -b "$SCSI_DEBUG_DEV" || _notrun "Failed to initialize scsi debug device"
+echo "SCSI debug device $SCSI_DEBUG_DEV" >>$seqres.full
+
+run_check _mkfs_dev $SCSI_DEBUG_DEV
+
+SCSI_DEBUG_MNT="$TEST_DIR/scsi_debug_$seq"
+rm -rf $SCSI_DEBUG_MNT
+mkdir $SCSI_DEBUG_MNT
+run_check _mount $SCSI_DEBUG_DEV $SCSI_DEBUG_MNT
+
+# create a test file
+$XFS_IO_PROG -f -c "pwrite 0 1M" -c "fsync" $SCSI_DEBUG_MNT/testfile >>$seqres.full
+
+# open a file descriptor for reading the file
+exec 3< $SCSI_DEBUG_MNT/testfile
+
+# drop all caches and delete the scsi debug device
+echo 3 > /proc/sys/vm/drop_caches
+echo 1 > /sys/block/`_short_dev $SCSI_DEBUG_DEV`/device/delete
+
+# try to read from the file, which should give us -EIO
+cat <&3 > /dev/null
+
+# close the file descriptor to not block unmount
+exec 3<&-
+
+status=0
+exit
diff --git a/tests/generic/731.out b/tests/generic/731.out
new file mode 100644
index 00000000..102c0522
--- /dev/null
+++ b/tests/generic/731.out
@@ -0,0 +1,2 @@
+QA output created by 731
+cat: -: Input/output error
--
2.39.2
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH 2/2] generic: add a test for device removal without dirty data
2023-07-24 15:29 ` [PATCH 2/2] generic: add a test for device removal without dirty data Christoph Hellwig
@ 2023-07-25 15:33 ` Darrick J. Wong
0 siblings, 0 replies; 9+ messages in thread
From: Darrick J. Wong @ 2023-07-25 15:33 UTC (permalink / raw)
To: Christoph Hellwig; +Cc: fstests
On Mon, Jul 24, 2023 at 08:29:27AM -0700, Christoph Hellwig wrote:
> Test the removal of the underlying device when the file system still
> does not have dirty data.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
Looks good, yay functional testing :)
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
--D
> ---
> tests/generic/731 | 58 +++++++++++++++++++++++++++++++++++++++++++
> tests/generic/731.out | 2 ++
> 2 files changed, 60 insertions(+)
> create mode 100755 tests/generic/731
> create mode 100644 tests/generic/731.out
>
> diff --git a/tests/generic/731 b/tests/generic/731
> new file mode 100755
> index 00000000..e1400d06
> --- /dev/null
> +++ b/tests/generic/731
> @@ -0,0 +1,58 @@
> +#! /bin/bash
> +# SPDX-License-Identifier: GPL-2.0
> +# Copyright (c) 2015 Red Hat Inc. All Rights Reserved.
> +# Copyright (c) 2023 Christoph Hellwig
> +#
> +# Test proper file system shut down when the block device is removed underneath
> +# and it has no dirty data.
> +#
> +#
> +. ./common/preamble
> +_begin_fstest auto quick
> +
> +_cleanup()
> +{
> + cd /
> + $UMOUNT_PROG $SCSI_DEBUG_MNT >>$seqres.full 2>&1
> + _put_scsi_debug_dev
> + rm -f $tmp.*
> +}
> +
> +. ./common/filter
> +. ./common/scsi_debug
> +
> +# We don't actually use the test device, but we need a block based fs
> +_require_test
> +_require_block_device $TEST_DEV
> +_supported_fs generic
> +_require_scsi_debug
> +
> +SCSI_DEBUG_DEV=`_get_scsi_debug_dev 512 512 0 256`
> +test -b "$SCSI_DEBUG_DEV" || _notrun "Failed to initialize scsi debug device"
> +echo "SCSI debug device $SCSI_DEBUG_DEV" >>$seqres.full
> +
> +run_check _mkfs_dev $SCSI_DEBUG_DEV
> +
> +SCSI_DEBUG_MNT="$TEST_DIR/scsi_debug_$seq"
> +rm -rf $SCSI_DEBUG_MNT
> +mkdir $SCSI_DEBUG_MNT
> +run_check _mount $SCSI_DEBUG_DEV $SCSI_DEBUG_MNT
> +
> +# create a test file
> +$XFS_IO_PROG -f -c "pwrite 0 1M" -c "fsync" $SCSI_DEBUG_MNT/testfile >>$seqres.full
> +
> +# open a file descriptor for reading the file
> +exec 3< $SCSI_DEBUG_MNT/testfile
> +
> +# drop all caches and delete the scsi debug device
> +echo 3 > /proc/sys/vm/drop_caches
> +echo 1 > /sys/block/`_short_dev $SCSI_DEBUG_DEV`/device/delete
> +
> +# try to read from the file, which should give us -EIO
> +cat <&3 > /dev/null
> +
> +# close the file descriptor to not block unmount
> +exec 3<&-
> +
> +status=0
> +exit
> diff --git a/tests/generic/731.out b/tests/generic/731.out
> new file mode 100644
> index 00000000..102c0522
> --- /dev/null
> +++ b/tests/generic/731.out
> @@ -0,0 +1,2 @@
> +QA output created by 731
> +cat: -: Input/output error
> --
> 2.39.2
>
^ permalink raw reply [flat|nested] 9+ messages in thread
* add device removal test
@ 2023-06-01 9:42 Christoph Hellwig
2023-06-01 9:42 ` [PATCH 2/2] generic: add a test for device removal without dirty data Christoph Hellwig
0 siblings, 1 reply; 9+ messages in thread
From: Christoph Hellwig @ 2023-06-01 9:42 UTC (permalink / raw)
To: fstests; +Cc: linux-fsdevel
Hi all,
this series adds two tests for removing a device underneath the
file system. This covers the new shutdown handling series I'm
posting.
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 2/2] generic: add a test for device removal without dirty data
2023-06-01 9:42 add device removal test Christoph Hellwig
@ 2023-06-01 9:42 ` Christoph Hellwig
0 siblings, 0 replies; 9+ messages in thread
From: Christoph Hellwig @ 2023-06-01 9:42 UTC (permalink / raw)
To: fstests; +Cc: linux-fsdevel
Test the removal of the underlying device when the file system still
does not have dirty data.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
tests/generic/730 | 55 +++++++++++++++++++++++++++++++++++++++++++
tests/generic/730.out | 2 ++
2 files changed, 57 insertions(+)
create mode 100755 tests/generic/730
create mode 100644 tests/generic/730.out
diff --git a/tests/generic/730 b/tests/generic/730
new file mode 100755
index 00000000..7f795da3
--- /dev/null
+++ b/tests/generic/730
@@ -0,0 +1,55 @@
+#! /bin/bash
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (c) 2015 Red Hat Inc. All Rights Reserved.
+# Copyright (c) 2023 Christoph Hellwig
+#
+# Test proper file system shut down when the block device is removed underneath
+# and it has no dirty data.
+#
+#
+. ./common/preamble
+_begin_fstest auto quick
+
+_cleanup()
+{
+ cd /
+ $UMOUNT_PROG $SCRATCH_MNT >>$seqres.full 2>&1
+ _put_scsi_debug_dev
+ rm -f $tmp.*
+}
+
+. ./common/filter
+. ./common/scsi_debug
+
+_supported_fs generic
+_require_scsi_debug
+
+physical=`blockdev --getpbsz $SCRATCH_DEV`
+logical=`blockdev --getss $SCRATCH_DEV`
+
+SCSI_DEBUG_DEV=`_get_scsi_debug_dev ${physical:-512} ${logical:-512} 0 300`
+test -b "$SCSI_DEBUG_DEV" || _notrun "Failed to initialize scsi debug device"
+echo "SCSI debug device $SCSI_DEBUG_DEV" >>$seqres.full
+
+_mkfs_dev $SCSI_DEBUG_DEV
+
+_mount $SCSI_DEBUG_DEV $SCRATCH_MNT
+
+# create a test file
+$XFS_IO_PROG -f -c "pwrite 0 1M" -c "fsync" $SCRATCH_MNT/testfile >>$seqres.full
+
+# open a file descriptor for reading the file
+exec 3< $SCRATCH_MNT/testfile
+
+# drop all caches and delete the scsi debug device
+echo 3 > /proc/sys/vm/drop_caches
+echo 1 > /sys/block/`_short_dev $SCSI_DEBUG_DEV`/device/delete
+
+# try to read from the file, which should give us -EIO
+cat <&3 > /dev/null
+
+# close the file descriptor to not block unmount
+exec 3<&-
+
+status=0
+exit
diff --git a/tests/generic/730.out b/tests/generic/730.out
new file mode 100644
index 00000000..79e96db8
--- /dev/null
+++ b/tests/generic/730.out
@@ -0,0 +1,2 @@
+QA output created by 730
+cat: -: Input/output error
--
2.39.2
^ permalink raw reply related [flat|nested] 9+ messages in thread
end of thread, other threads:[~2023-07-25 15:33 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-07-11 10:09 add device removal test v2 Christoph Hellwig
2023-07-11 10:09 ` [PATCH 1/2] generic: add a test for device removal with dirty data Christoph Hellwig
2023-07-18 10:34 ` Zorro Lang
2023-07-23 4:50 ` [PATCH] " Zorro Lang
2023-07-24 13:32 ` Christoph Hellwig
2023-07-11 10:09 ` [PATCH 2/2] generic: add a test for device removal without " Christoph Hellwig
-- strict thread matches above, loose matches on Subject: below --
2023-07-24 15:29 add device removal test v3 Christoph Hellwig
2023-07-24 15:29 ` [PATCH 2/2] generic: add a test for device removal without dirty data Christoph Hellwig
2023-07-25 15:33 ` Darrick J. Wong
2023-06-01 9:42 add device removal test Christoph Hellwig
2023-06-01 9:42 ` [PATCH 2/2] generic: add a test for device removal without dirty data Christoph Hellwig
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox