diff mbox series

[v2] fstests: Verify that removed device has its superblocks deleted

Message ID 20190325140713.9509-1-nborisov@suse.com (mailing list archive)
State New, archived
Headers show
Series [v2] fstests: Verify that removed device has its superblocks deleted | expand

Commit Message

Nikolay Borisov March 25, 2019, 2:07 p.m. UTC 
When a device is removed from a btrfs filesystem its superblock copies
must be deleted. This test ensures this is indeed the case.

Signed-off-by: Nikolay Borisov <nborisov@suse.com>
---

Changes since v1:
 * Use _scratch_dev_pool_(get|put) to ensure the test uses exactly 2 devices. 
 
 * Explicitly use -draid0 -mraid0 mkfs options for the scratch devices to 
 ensure at least one of the device could be removed. Also add a comment about 
 that. 

 tests/btrfs/184     | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 tests/btrfs/184.out |  2 ++
 tests/btrfs/group   |  1 +
 3 files changed, 66 insertions(+)
 create mode 100755 tests/btrfs/184
 create mode 100644 tests/btrfs/184.out

Comments

Anand Jain March 25, 2019, 9:55 p.m. UTC | #1 
On 3/25/19 10:07 PM, Nikolay Borisov wrote:
> When a device is removed from a btrfs filesystem its superblock copies
> must be deleted. 

AFAIK this bug was fixed a long time back in the kernel. Is there any 
newer fix in the kernel?

 > This test ensures this is indeed the case.

> Signed-off-by: Nikolay Borisov <nborisov@suse.com>

Looks good.

Reviewed-by: Anand Jain <anand.jain@oracle.com>

> ---
> 
> Changes since v1:
>   * Use _scratch_dev_pool_(get|put) to ensure the test uses exactly 2 devices.
>   
>   * Explicitly use -draid0 -mraid0 mkfs options for the scratch devices to
>   ensure at least one of the device could be removed. Also add a comment about
>   that.
> 
>   tests/btrfs/184     | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++++
>   tests/btrfs/184.out |  2 ++
>   tests/btrfs/group   |  1 +
>   3 files changed, 66 insertions(+)
>   create mode 100755 tests/btrfs/184
>   create mode 100644 tests/btrfs/184.out
> 
> diff --git a/tests/btrfs/184 b/tests/btrfs/184
> new file mode 100755
> index 000000000000..49fe5c9c27bb
> --- /dev/null
> +++ b/tests/btrfs/184
> @@ -0,0 +1,63 @@
> +#! /bin/bash
> +# SPDX-License-Identifier: GPL-2.0
> +# Copyright (c) 2019 SUSE LLC. All Rights Reserved.
> +#
> +# FS QA Test 184
> +#
> +# Verify that when a device is removed from a multi-device
> +# filesystem its superblock copies are correctly deleted
> +#
> +seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> +echo "QA output created by $seq"
> +
> +here=`pwd`
> +tmp=/tmp/$$
> +status=1	# failure is the default!
> +trap "_cleanup; exit \$status" 0 1 2 3 15
> +
> +_cleanup()
> +{
> +	cd /
> +	rm -f $tmp.*
> +}
> +
> +# get standard environment, filters and checks
> +. ./common/rc
> +. ./common/filter
> +
> +rm -f $seqres.full
> +
> +# real QA test starts here
> +_supported_fs btrfs
> +_supported_os Linux
> +_require_scratch
> +_require_scratch_dev_pool 2
> +_require_btrfs_command inspect-internal dump-super
> +
> +_scratch_dev_pool_get 2
> +
> +# Explicitly use raid0 mode to ensure at least one of the devices can be
> +# removed.
> +_scratch_pool_mkfs "-d raid0 -m raid0" >> $seqres.full 2>&1 || _fail "mkfs failed"
> +_scratch_mount
> +
> +# pick last dev in the list
> +dev_del=`echo ${SCRATCH_DEV_POOL} | awk '{print $NF}'`
> +$BTRFS_UTIL_PROG device delete $dev_del $SCRATCH_MNT || _fail "btrfs device delete failed"
> +for i in {0..2}; do
> +    output=$($BTRFS_UTIL_PROG inspect-internal dump-super -s $i $dev_del 2>&1)
> +    $BTRFS_UTIL_PROG inspect-internal dump-super -s $i $dev_del 2>&1 | grep -q "bad magic"
> +    ret=$?
> +    if [[ "$output" != "" && $ret -eq 1 ]]; then
> +        _fail "Deleted dev superblocks not scratched"
> +    fi
> +done
> +_scratch_unmount
> +
> +_scratch_dev_pool_put
> +
> +# success, all done
> +echo "Silence is golden"
> +status=0
> +exit
> diff --git a/tests/btrfs/184.out b/tests/btrfs/184.out
> new file mode 100644
> index 000000000000..b4ce96cfc047
> --- /dev/null
> +++ b/tests/btrfs/184.out
> @@ -0,0 +1,2 @@
> +QA output created by 184
> +Silence is golden
> diff --git a/tests/btrfs/group b/tests/btrfs/group
> index f3227c1708d9..c1d215bf5ff8 100644
> --- a/tests/btrfs/group
> +++ b/tests/btrfs/group
> @@ -186,3 +186,4 @@
>   181 auto quick balance
>   182 auto quick balance
>   183 auto quick clone compress punch
> +184 auto quick volume
>
Nikolay Borisov March 26, 2019, 2:11 p.m. UTC | #2 
On 25.03.19 г. 23:55 ч., Anand Jain wrote:
> 
> 
> On 3/25/19 10:07 PM, Nikolay Borisov wrote:
>> When a device is removed from a btrfs filesystem its superblock copies
>> must be deleted. 
> 
> AFAIK this bug was fixed a long time back in the kernel. Is there any
> newer fix in the kernel?

No there isn't but we currently don't have a test that covers that
functionality and I have some changes in progress that touch superblock
writing code so I'd rather be safe than sorry.

> 
>> This test ensures this is indeed the case.
> 
>> Signed-off-by: Nikolay Borisov <nborisov@suse.com>
> 
> Looks good.
> 
> Reviewed-by: Anand Jain <anand.jain@oracle.com>
> 
>> ---
>>
>> Changes since v1:
>>   * Use _scratch_dev_pool_(get|put) to ensure the test uses exactly 2
>> devices.
>>     * Explicitly use -draid0 -mraid0 mkfs options for the scratch
>> devices to
>>   ensure at least one of the device could be removed. Also add a
>> comment about
>>   that.
>>
>>   tests/btrfs/184     | 63
>> +++++++++++++++++++++++++++++++++++++++++++++++++++++
>>   tests/btrfs/184.out |  2 ++
>>   tests/btrfs/group   |  1 +
>>   3 files changed, 66 insertions(+)
>>   create mode 100755 tests/btrfs/184
>>   create mode 100644 tests/btrfs/184.out
>>
>> diff --git a/tests/btrfs/184 b/tests/btrfs/184
>> new file mode 100755
>> index 000000000000..49fe5c9c27bb
>> --- /dev/null
>> +++ b/tests/btrfs/184
>> @@ -0,0 +1,63 @@
>> +#! /bin/bash
>> +# SPDX-License-Identifier: GPL-2.0
>> +# Copyright (c) 2019 SUSE LLC. All Rights Reserved.
>> +#
>> +# FS QA Test 184
>> +#
>> +# Verify that when a device is removed from a multi-device
>> +# filesystem its superblock copies are correctly deleted
>> +#
>> +seq=`basename $0`
>> +seqres=$RESULT_DIR/$seq
>> +echo "QA output created by $seq"
>> +
>> +here=`pwd`
>> +tmp=/tmp/$$
>> +status=1    # failure is the default!
>> +trap "_cleanup; exit \$status" 0 1 2 3 15
>> +
>> +_cleanup()
>> +{
>> +    cd /
>> +    rm -f $tmp.*
>> +}
>> +
>> +# get standard environment, filters and checks
>> +. ./common/rc
>> +. ./common/filter
>> +
>> +rm -f $seqres.full
>> +
>> +# real QA test starts here
>> +_supported_fs btrfs
>> +_supported_os Linux
>> +_require_scratch
>> +_require_scratch_dev_pool 2
>> +_require_btrfs_command inspect-internal dump-super
>> +
>> +_scratch_dev_pool_get 2
>> +
>> +# Explicitly use raid0 mode to ensure at least one of the devices can be
>> +# removed.
>> +_scratch_pool_mkfs "-d raid0 -m raid0" >> $seqres.full 2>&1 || _fail
>> "mkfs failed"
>> +_scratch_mount
>> +
>> +# pick last dev in the list
>> +dev_del=`echo ${SCRATCH_DEV_POOL} | awk '{print $NF}'`
>> +$BTRFS_UTIL_PROG device delete $dev_del $SCRATCH_MNT || _fail "btrfs
>> device delete failed"
>> +for i in {0..2}; do
>> +    output=$($BTRFS_UTIL_PROG inspect-internal dump-super -s $i
>> $dev_del 2>&1)
>> +    $BTRFS_UTIL_PROG inspect-internal dump-super -s $i $dev_del 2>&1
>> | grep -q "bad magic"
>> +    ret=$?
>> +    if [[ "$output" != "" && $ret -eq 1 ]]; then
>> +        _fail "Deleted dev superblocks not scratched"
>> +    fi
>> +done
>> +_scratch_unmount
>> +
>> +_scratch_dev_pool_put
>> +
>> +# success, all done
>> +echo "Silence is golden"
>> +status=0
>> +exit
>> diff --git a/tests/btrfs/184.out b/tests/btrfs/184.out
>> new file mode 100644
>> index 000000000000..b4ce96cfc047
>> --- /dev/null
>> +++ b/tests/btrfs/184.out
>> @@ -0,0 +1,2 @@
>> +QA output created by 184
>> +Silence is golden
>> diff --git a/tests/btrfs/group b/tests/btrfs/group
>> index f3227c1708d9..c1d215bf5ff8 100644
>> --- a/tests/btrfs/group
>> +++ b/tests/btrfs/group
>> @@ -186,3 +186,4 @@
>>   181 auto quick balance
>>   182 auto quick balance
>>   183 auto quick clone compress punch
>> +184 auto quick volume
>>
>
diff mbox series

Patch

diff --git a/tests/btrfs/184 b/tests/btrfs/184
new file mode 100755
index 000000000000..49fe5c9c27bb
--- /dev/null
+++ b/tests/btrfs/184
@@ -0,0 +1,63 @@ 
+#! /bin/bash
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (c) 2019 SUSE LLC. All Rights Reserved.
+#
+# FS QA Test 184
+#
+# Verify that when a device is removed from a multi-device
+# filesystem its superblock copies are correctly deleted
+#
+seq=`basename $0`
+seqres=$RESULT_DIR/$seq
+echo "QA output created by $seq"
+
+here=`pwd`
+tmp=/tmp/$$
+status=1	# failure is the default!
+trap "_cleanup; exit \$status" 0 1 2 3 15
+
+_cleanup()
+{
+	cd /
+	rm -f $tmp.*
+}
+
+# get standard environment, filters and checks
+. ./common/rc
+. ./common/filter
+
+rm -f $seqres.full
+
+# real QA test starts here
+_supported_fs btrfs
+_supported_os Linux
+_require_scratch
+_require_scratch_dev_pool 2
+_require_btrfs_command inspect-internal dump-super
+
+_scratch_dev_pool_get 2
+
+# Explicitly use raid0 mode to ensure at least one of the devices can be 
+# removed. 
+_scratch_pool_mkfs "-d raid0 -m raid0" >> $seqres.full 2>&1 || _fail "mkfs failed"
+_scratch_mount
+                                                                            
+# pick last dev in the list
+dev_del=`echo ${SCRATCH_DEV_POOL} | awk '{print $NF}'`
+$BTRFS_UTIL_PROG device delete $dev_del $SCRATCH_MNT || _fail "btrfs device delete failed"
+for i in {0..2}; do
+    output=$($BTRFS_UTIL_PROG inspect-internal dump-super -s $i $dev_del 2>&1)
+    $BTRFS_UTIL_PROG inspect-internal dump-super -s $i $dev_del 2>&1 | grep -q "bad magic"
+    ret=$?
+    if [[ "$output" != "" && $ret -eq 1 ]]; then
+        _fail "Deleted dev superblocks not scratched"
+    fi
+done
+_scratch_unmount
+
+_scratch_dev_pool_put
+
+# success, all done
+echo "Silence is golden"
+status=0
+exit
diff --git a/tests/btrfs/184.out b/tests/btrfs/184.out
new file mode 100644
index 000000000000..b4ce96cfc047
--- /dev/null
+++ b/tests/btrfs/184.out
@@ -0,0 +1,2 @@ 
+QA output created by 184
+Silence is golden
diff --git a/tests/btrfs/group b/tests/btrfs/group
index f3227c1708d9..c1d215bf5ff8 100644
--- a/tests/btrfs/group
+++ b/tests/btrfs/group
@@ -186,3 +186,4 @@ 
 181 auto quick balance
 182 auto quick balance
 183 auto quick clone compress punch
+184 auto quick volume