xfstests: btrfs/023: test if raids are actually created
diff mbox

Message ID 1384763177-3402-1-git-send-email-anand.jain@oracle.com
State Not Applicable
Headers show

Commit Message

Anand Jain Nov. 18, 2013, 8:26 a.m. UTC
A test case to verify if the given raid option for the
metadata and data are actually created.

Signed-off-by: Anand Jain <anand.jain@oracle.com>
---
 tests/btrfs/023     |   91 +++++++++++++++++++++++++++++++++++++++++++++++++++
 tests/btrfs/023.out |    2 +
 tests/btrfs/group   |    1 +
 3 files changed, 94 insertions(+), 0 deletions(-)
 create mode 100755 tests/btrfs/023
 create mode 100644 tests/btrfs/023.out

Comments

Eric Sandeen Nov. 18, 2013, 9:50 p.m. UTC | #1
On 11/18/13, 2:26 AM, Anand Jain wrote:
> A test case to verify if the given raid option for the
> metadata and data are actually created.
> 
> Signed-off-by: Anand Jain <anand.jain@oracle.com>
> ---
>  tests/btrfs/023     |   91 +++++++++++++++++++++++++++++++++++++++++++++++++++
>  tests/btrfs/023.out |    2 +
>  tests/btrfs/group   |    1 +
>  3 files changed, 94 insertions(+), 0 deletions(-)
>  create mode 100755 tests/btrfs/023
>  create mode 100644 tests/btrfs/023.out
> 
> diff --git a/tests/btrfs/023 b/tests/btrfs/023
> new file mode 100755
> index 0000000..77934fd
> --- /dev/null
> +++ b/tests/btrfs/023
> @@ -0,0 +1,91 @@
> +#! /bin/bash
> +# FS QA Test No. 022
> +#
> +# Test to verify if the group profile is created
> +#
> +# The test aims to create the raid and verify that its created
> +#
> +#-----------------------------------------------------------------------
> +# Copyright (c) 2013 Oracle.  All Rights Reserved.
> +#
> +# This program is free software; you can redistribute it and/or
> +# modify it under the terms of the GNU General Public License as
> +# published by the Free Software Foundation.
> +#
> +# This program is distributed in the hope that it would be useful,
> +# but WITHOUT ANY WARRANTY; without even the implied warranty of
> +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> +# GNU General Public License for more details.
> +#
> +# You should have received a copy of the GNU General Public License
> +# along with this program; if not, write the Free Software Foundation,
> +# Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
> +#-----------------------------------------------------------------------
> +#
> +
> +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
> +
> +# real QA test starts here
> +_supported_fs btrfs
> +_supported_os Linux
> +_require_scratch_dev_pool 4
> +rm -f $seqres.full
> +
> +create_group_profile()
> +{
> +	local mkfs_options="-d$1 -m$1"
> +
> +	# _scratch_mkfs adds the 1st device again (which is $SCRATCH_DEV)

The comment doesn't make anything clearer to me - you say what _scratch_mkfs
does but then you call _scratch_pool_mkfs.  I could look, of course, but the
purpose of a comment is to make things clearer, not to make the reader wonder
why you wrote the comment.  ;)

> +	_scratch_pool_mkfs $mkfs_options >> $seqres.full 2>&1 || _fail "mkfs failed"
> +}
> +
> +check_group_profile()
> +{
> +	local test_raid="$1"
> +
> +	_scratch_mount
> +	$BTRFS_UTIL_PROG filesystem df $SCRATCH_MNT > $tmp.tmp 2>&1
> +	_scratch_unmount
> +	cat $tmp.tmp >> $seqres.full
> +	grep Data $tmp.tmp | grep -q $test_raid
> +	[ $? -eq 0 ] || _fail "$test_raid not found for Data"
> +	grep Metadata $tmp.tmp | grep -q $test_raid
> +	[ $? -eq 0 ] || _fail "$test_raid not found for Metadata"

Should these be more specific?  I.e. do you want to do:

grep "^Data, " | grep -q $test_raid

because (at least in my version of btrfs-progs) there are two Data
lines in the df output (and two Metadata lines as well).

Which reminds me, has df output changed semi-recently, and do you need
to handle that?  (Maybe that's what the non-specific grep accomplishes?)

Also, I'm curious (maybe I just haven't been keeping up) - was there a bug
where mkfs succeeded but didn't make the requested raid level?

thanks,
-Eric



> +}
> +
> +create_group_profile "raid0"
> +check_group_profile "RAID0"
> +
> +create_group_profile "raid1"
> +check_group_profile "RAID1"
> +
> +create_group_profile "raid10"
> +check_group_profile "RAID10"
> +
> +create_group_profile "raid5"
> +check_group_profile "RAID5"
> +
> +create_group_profile "raid6"
> +check_group_profile "RAID6"
> +
> +# success, all done
> +echo "Silence is golden"
> +status=0
> +exit
> diff --git a/tests/btrfs/023.out b/tests/btrfs/023.out
> new file mode 100644
> index 0000000..5c4197b
> --- /dev/null
> +++ b/tests/btrfs/023.out
> @@ -0,0 +1,2 @@
> +QA output created by 023
> +Silence is golden
> diff --git a/tests/btrfs/group b/tests/btrfs/group
> index 410f8ed..35db67b 100644
> --- a/tests/btrfs/group
> +++ b/tests/btrfs/group
> @@ -24,3 +24,4 @@
>  019 auto quick
>  020 auto quick
>  021 auto quick
> +023 auto
> 

--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Anand Jain Nov. 19, 2013, 2:08 a.m. UTC | #2
On 11/19/2013 05:50 AM, Eric Sandeen wrote:
> On 11/18/13, 2:26 AM, Anand Jain wrote:
>> A test case to verify if the given raid option for the
>> metadata and data are actually created.
>>
>> Signed-off-by: Anand Jain <anand.jain@oracle.com>
>> ---
>>   tests/btrfs/023     |   91 +++++++++++++++++++++++++++++++++++++++++++++++++++
>>   tests/btrfs/023.out |    2 +
>>   tests/btrfs/group   |    1 +
>>   3 files changed, 94 insertions(+), 0 deletions(-)
>>   create mode 100755 tests/btrfs/023
>>   create mode 100644 tests/btrfs/023.out
>>
>> diff --git a/tests/btrfs/023 b/tests/btrfs/023
>> new file mode 100755
>> index 0000000..77934fd
>> --- /dev/null
>> +++ b/tests/btrfs/023
>> @@ -0,0 +1,91 @@
>> +#! /bin/bash
>> +# FS QA Test No. 022
>> +#
>> +# Test to verify if the group profile is created
>> +#
>> +# The test aims to create the raid and verify that its created
>> +#
>> +#-----------------------------------------------------------------------
>> +# Copyright (c) 2013 Oracle.  All Rights Reserved.
>> +#
>> +# This program is free software; you can redistribute it and/or
>> +# modify it under the terms of the GNU General Public License as
>> +# published by the Free Software Foundation.
>> +#
>> +# This program is distributed in the hope that it would be useful,
>> +# but WITHOUT ANY WARRANTY; without even the implied warranty of
>> +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
>> +# GNU General Public License for more details.
>> +#
>> +# You should have received a copy of the GNU General Public License
>> +# along with this program; if not, write the Free Software Foundation,
>> +# Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>> +#-----------------------------------------------------------------------
>> +#
>> +
>> +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
>> +
>> +# real QA test starts here
>> +_supported_fs btrfs
>> +_supported_os Linux
>> +_require_scratch_dev_pool 4
>> +rm -f $seqres.full
>> +
>> +create_group_profile()
>> +{
>> +	local mkfs_options="-d$1 -m$1"
>> +
>> +	# _scratch_mkfs adds the 1st device again (which is $SCRATCH_DEV)
>
> The comment doesn't make anything clearer to me - you say what _scratch_mkfs
> does but then you call _scratch_pool_mkfs.  I could look, of course, but the
> purpose of a comment is to make things clearer, not to make the reader wonder
> why you wrote the comment.  ;)

  Its cut and paste error I will remove the comment.


>> +	_scratch_pool_mkfs $mkfs_options >> $seqres.full 2>&1 || _fail "mkfs failed"
>> +}
>> +
>> +check_group_profile()
>> +{
>> +	local test_raid="$1"
>> +
>> +	_scratch_mount
>> +	$BTRFS_UTIL_PROG filesystem df $SCRATCH_MNT > $tmp.tmp 2>&1
>> +	_scratch_unmount
>> +	cat $tmp.tmp >> $seqres.full
>> +	grep Data $tmp.tmp | grep -q $test_raid
>> +	[ $? -eq 0 ] || _fail "$test_raid not found for Data"
>> +	grep Metadata $tmp.tmp | grep -q $test_raid
>> +	[ $? -eq 0 ] || _fail "$test_raid not found for Metadata"
>
> Should these be more specific?  I.e. do you want to do:
>
> grep "^Data, " | grep -q $test_raid
>
> because (at least in my version of btrfs-progs) there are two Data
> lines in the df output (and two Metadata lines as well).

> Which reminds me, has df output changed semi-recently, and do you need
> to handle that?  (Maybe that's what the non-specific grep accomplishes?)

  Its generic enough to ignore minor format changes and check if
  there is Data/Metadata and the given-raid. I can't think of anything
  which break this.

> Also, I'm curious (maybe I just haven't been keeping up) - was there a bug
> where mkfs succeeded but didn't make the requested raid level?
>
> thanks,
> -Eric
>
>
>
>> +}
>> +
>> +create_group_profile "raid0"
>> +check_group_profile "RAID0"
>> +
>> +create_group_profile "raid1"
>> +check_group_profile "RAID1"
>> +
>> +create_group_profile "raid10"
>> +check_group_profile "RAID10"
>> +
>> +create_group_profile "raid5"
>> +check_group_profile "RAID5"
>> +
>> +create_group_profile "raid6"
>> +check_group_profile "RAID6"
>> +
>> +# success, all done
>> +echo "Silence is golden"
>> +status=0
>> +exit
>> diff --git a/tests/btrfs/023.out b/tests/btrfs/023.out
>> new file mode 100644
>> index 0000000..5c4197b
>> --- /dev/null
>> +++ b/tests/btrfs/023.out
>> @@ -0,0 +1,2 @@
>> +QA output created by 023
>> +Silence is golden
>> diff --git a/tests/btrfs/group b/tests/btrfs/group
>> index 410f8ed..35db67b 100644
>> --- a/tests/btrfs/group
>> +++ b/tests/btrfs/group
>> @@ -24,3 +24,4 @@
>>   019 auto quick
>>   020 auto quick
>>   021 auto quick
>> +023 auto
>>
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch
diff mbox

diff --git a/tests/btrfs/023 b/tests/btrfs/023
new file mode 100755
index 0000000..77934fd
--- /dev/null
+++ b/tests/btrfs/023
@@ -0,0 +1,91 @@ 
+#! /bin/bash
+# FS QA Test No. 022
+#
+# Test to verify if the group profile is created
+#
+# The test aims to create the raid and verify that its created
+#
+#-----------------------------------------------------------------------
+# Copyright (c) 2013 Oracle.  All Rights Reserved.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it would be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write the Free Software Foundation,
+# Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#-----------------------------------------------------------------------
+#
+
+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
+
+# real QA test starts here
+_supported_fs btrfs
+_supported_os Linux
+_require_scratch_dev_pool 4
+rm -f $seqres.full
+
+create_group_profile()
+{
+	local mkfs_options="-d$1 -m$1"
+
+	# _scratch_mkfs adds the 1st device again (which is $SCRATCH_DEV)
+	_scratch_pool_mkfs $mkfs_options >> $seqres.full 2>&1 || _fail "mkfs failed"
+}
+
+check_group_profile()
+{
+	local test_raid="$1"
+
+	_scratch_mount
+	$BTRFS_UTIL_PROG filesystem df $SCRATCH_MNT > $tmp.tmp 2>&1
+	_scratch_unmount
+	cat $tmp.tmp >> $seqres.full
+	grep Data $tmp.tmp | grep -q $test_raid
+	[ $? -eq 0 ] || _fail "$test_raid not found for Data"
+	grep Metadata $tmp.tmp | grep -q $test_raid
+	[ $? -eq 0 ] || _fail "$test_raid not found for Metadata"
+}
+
+create_group_profile "raid0"
+check_group_profile "RAID0"
+
+create_group_profile "raid1"
+check_group_profile "RAID1"
+
+create_group_profile "raid10"
+check_group_profile "RAID10"
+
+create_group_profile "raid5"
+check_group_profile "RAID5"
+
+create_group_profile "raid6"
+check_group_profile "RAID6"
+
+# success, all done
+echo "Silence is golden"
+status=0
+exit
diff --git a/tests/btrfs/023.out b/tests/btrfs/023.out
new file mode 100644
index 0000000..5c4197b
--- /dev/null
+++ b/tests/btrfs/023.out
@@ -0,0 +1,2 @@ 
+QA output created by 023
+Silence is golden
diff --git a/tests/btrfs/group b/tests/btrfs/group
index 410f8ed..35db67b 100644
--- a/tests/btrfs/group
+++ b/tests/btrfs/group
@@ -24,3 +24,4 @@ 
 019 auto quick
 020 auto quick
 021 auto quick
+023 auto