[PATCH 1/2] xfstests: make btrfs/001.out in line with subvol delete output

[PATCH 1/2] xfstests: make btrfs/001.out in line with subvol delete output

[Anand Jain]

From: Anand Jain <Anand.Jain@oracle.com>

btrfs/001 is failing as below btrfs-progs patch changed the
output during subvol delete.
Patch :
btrfs-progs: add options to set commit mode after subvol delete

so add it to the btrfs/001.out

Signed-off-by: Anand Jain <Anand.Jain@oracle.com>
---
 tests/btrfs/001.out | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/btrfs/001.out b/tests/btrfs/001.out
index c782bde..a255614 100644
--- a/tests/btrfs/001.out
+++ b/tests/btrfs/001.out
@@ -33,6 +33,7 @@ subvol
 Listing subvolumes
 snap
 subvol
+Transaction commit: none (default)
 Delete subvolume 'SCRATCH_MNT/snap'
 List root dir
 subvol
-- 
1.8.4.2

[PATCH 1/2] xfstests: make btrfs/001.out in line with subvol delete output

[Anand Jain]

From: Anand Jain <Anand.Jain@oracle.com>

btrfs/001 is failing as below btrfs-progs patch changed the
output during subvol delete.
Patch :
btrfs-progs: add options to set commit mode after subvol delete

so add it to the btrfs/001.out

Signed-off-by: Anand Jain <Anand.Jain@oracle.com>
---
 tests/btrfs/001.out | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/btrfs/001.out b/tests/btrfs/001.out
index c782bde..a255614 100644
--- a/tests/btrfs/001.out
+++ b/tests/btrfs/001.out
@@ -33,6 +33,7 @@ subvol
 Listing subvolumes
 snap
 subvol
+Transaction commit: none (default)
 Delete subvolume 'SCRATCH_MNT/snap'
 List root dir
 subvol
-- 
1.8.4.2

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

Re: [PATCH 1/2] xfstests: make btrfs/001.out in line with subvol delete output

[Wang Shilong]

Hello Anand,

I was noticing this problem when using the latest btrfs-progs to test ^_^

I think a better way is to filter message 'Transaction commit: none (default)'
Rather than add it, otherwise, people will fail this test if they use previous
btrfs-progs……

Thanks,
Wang
> From: Anand Jain <Anand.Jain@oracle.com>
> 
> btrfs/001 is failing as below btrfs-progs patch changed the
> output during subvol delete.
> Patch :
> btrfs-progs: add options to set commit mode after subvol delete
> 
> so add it to the btrfs/001.out
> 
> Signed-off-by: Anand Jain <Anand.Jain@oracle.com>
> ---
> tests/btrfs/001.out | 1 +
> 1 file changed, 1 insertion(+)
> 
> diff --git a/tests/btrfs/001.out b/tests/btrfs/001.out
> index c782bde..a255614 100644
> --- a/tests/btrfs/001.out
> +++ b/tests/btrfs/001.out
> @@ -33,6 +33,7 @@ subvol
> Listing subvolumes
> snap
> subvol
> +Transaction commit: none (default)
> Delete subvolume 'SCRATCH_MNT/snap'
> List root dir
> subvol
> -- 
> 1.8.4.2
> 
> --
> 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

Re: [PATCH 1/2] xfstests: make btrfs/001.out in line with subvol delete output

[Wang Shilong]

Hello Anand,

I was noticing this problem when using the latest btrfs-progs to test ^_^

I think a better way is to filter message 'Transaction commit: none (default)'
Rather than add it, otherwise, people will fail this test if they use previous
btrfs-progs……

Thanks,
Wang
> From: Anand Jain <Anand.Jain@oracle.com>
> 
> btrfs/001 is failing as below btrfs-progs patch changed the
> output during subvol delete.
> Patch :
> btrfs-progs: add options to set commit mode after subvol delete
> 
> so add it to the btrfs/001.out
> 
> Signed-off-by: Anand Jain <Anand.Jain@oracle.com>
> ---
> tests/btrfs/001.out | 1 +
> 1 file changed, 1 insertion(+)
> 
> diff --git a/tests/btrfs/001.out b/tests/btrfs/001.out
> index c782bde..a255614 100644
> --- a/tests/btrfs/001.out
> +++ b/tests/btrfs/001.out
> @@ -33,6 +33,7 @@ subvol
> Listing subvolumes
> snap
> subvol
> +Transaction commit: none (default)
> Delete subvolume 'SCRATCH_MNT/snap'
> List root dir
> subvol
> -- 
> 1.8.4.2
> 
> --
> 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

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

Re: [PATCH 1/2] xfstests: make btrfs/001.out in line with subvol delete output

[Anand Jain]

Hi Wang,

 Ah yes. why did I miss that point earlier.
 Will fix it.

Thanks, Anand


On 13/01/2014 21:14, Wang Shilong wrote:
> Hello Anand,
> 
> I was noticing this problem when using the latest btrfs-progs to test ^_^
> 
> I think a better way is to filter message 'Transaction commit: none (default)'
> Rather than add it, otherwise, people will fail this test if they use previous
> btrfs-progs……
> 
> Thanks,
> Wang
>> From: Anand Jain <Anand.Jain@oracle.com>
>>
>> btrfs/001 is failing as below btrfs-progs patch changed the
>> output during subvol delete.
>> Patch :
>> btrfs-progs: add options to set commit mode after subvol delete
>>
>> so add it to the btrfs/001.out
>>
>> Signed-off-by: Anand Jain <Anand.Jain@oracle.com>
>> ---
>> tests/btrfs/001.out | 1 +
>> 1 file changed, 1 insertion(+)
>>
>> diff --git a/tests/btrfs/001.out b/tests/btrfs/001.out
>> index c782bde..a255614 100644
>> --- a/tests/btrfs/001.out
>> +++ b/tests/btrfs/001.out
>> @@ -33,6 +33,7 @@ subvol
>> Listing subvolumes
>> snap
>> subvol
>> +Transaction commit: none (default)
>> Delete subvolume 'SCRATCH_MNT/snap'
>> List root dir
>> subvol
>> -- 
>> 1.8.4.2
>>
>> --
>> 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
> 

Re: [PATCH 1/2] xfstests: make btrfs/001.out in line with subvol delete output

[Anand Jain]

Hi Wang,

 Ah yes. why did I miss that point earlier.
 Will fix it.

Thanks, Anand


On 13/01/2014 21:14, Wang Shilong wrote:
> Hello Anand,
> 
> I was noticing this problem when using the latest btrfs-progs to test ^_^
> 
> I think a better way is to filter message 'Transaction commit: none (default)'
> Rather than add it, otherwise, people will fail this test if they use previous
> btrfs-progs……
> 
> Thanks,
> Wang
>> From: Anand Jain <Anand.Jain@oracle.com>
>>
>> btrfs/001 is failing as below btrfs-progs patch changed the
>> output during subvol delete.
>> Patch :
>> btrfs-progs: add options to set commit mode after subvol delete
>>
>> so add it to the btrfs/001.out
>>
>> Signed-off-by: Anand Jain <Anand.Jain@oracle.com>
>> ---
>> tests/btrfs/001.out | 1 +
>> 1 file changed, 1 insertion(+)
>>
>> diff --git a/tests/btrfs/001.out b/tests/btrfs/001.out
>> index c782bde..a255614 100644
>> --- a/tests/btrfs/001.out
>> +++ b/tests/btrfs/001.out
>> @@ -33,6 +33,7 @@ subvol
>> Listing subvolumes
>> snap
>> subvol
>> +Transaction commit: none (default)
>> Delete subvolume 'SCRATCH_MNT/snap'
>> List root dir
>> subvol
>> -- 
>> 1.8.4.2
>>
>> --
>> 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
> 

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

[PATCH 2/2] xfstest: tests btrfs/006 fails with mixed-mode/small disks

[Anand Jain]

From: Anand Jain <Anand.Jain@oracle.com>

as of now the script does not filter 0.00 size  in the
filesystem show output, which is the case in multi-disk
mixed-mode (that is default group type for small disks)

Signed-off-by: Anand Jain <Anand.Jain@oracle.com>
---
 common/filter       | 6 ++++++
 common/filter.btrfs | 1 +
 2 files changed, 7 insertions(+)

diff --git a/common/filter b/common/filter
index c872a27..04d12c4 100644
--- a/common/filter
+++ b/common/filter
@@ -277,6 +277,12 @@ _filter_uuid()
 	fi
 }
 
+# In mixed group the added disks may have zero used size
+_filter_zero_size()
+{
+	sed -e "s/0\.00/<SIZE>/g"
+}
+
 # Filter out sizes like 6.14MB etc
 _filter_size()
 {
diff --git a/common/filter.btrfs b/common/filter.btrfs
index 29512cd..75853f2 100644
--- a/common/filter.btrfs
+++ b/common/filter.btrfs
@@ -33,6 +33,7 @@ _filter_btrfs_filesystem_show()
 	# the uniq collapses all device lines into 1
 	_filter_uuid $UUID | _filter_scratch | _filter_scratch_pool | \
 	_filter_size | _filter_btrfs_version | _filter_devid | \
+	_filter_zero_size | \
 	sed -e "s/\(Total devices\) $NUMDEVS/\1 $NUM_SUBST/g" | \
 	uniq
 }
-- 
1.8.4.2

[PATCH 2/2] xfstest: tests btrfs/006 fails with mixed-mode/small disks

[Anand Jain]

From: Anand Jain <Anand.Jain@oracle.com>

as of now the script does not filter 0.00 size  in the
filesystem show output, which is the case in multi-disk
mixed-mode (that is default group type for small disks)

Signed-off-by: Anand Jain <Anand.Jain@oracle.com>
---
 common/filter       | 6 ++++++
 common/filter.btrfs | 1 +
 2 files changed, 7 insertions(+)

diff --git a/common/filter b/common/filter
index c872a27..04d12c4 100644
--- a/common/filter
+++ b/common/filter
@@ -277,6 +277,12 @@ _filter_uuid()
 	fi
 }
 
+# In mixed group the added disks may have zero used size
+_filter_zero_size()
+{
+	sed -e "s/0\.00/<SIZE>/g"
+}
+
 # Filter out sizes like 6.14MB etc
 _filter_size()
 {
diff --git a/common/filter.btrfs b/common/filter.btrfs
index 29512cd..75853f2 100644
--- a/common/filter.btrfs
+++ b/common/filter.btrfs
@@ -33,6 +33,7 @@ _filter_btrfs_filesystem_show()
 	# the uniq collapses all device lines into 1
 	_filter_uuid $UUID | _filter_scratch | _filter_scratch_pool | \
 	_filter_size | _filter_btrfs_version | _filter_devid | \
+	_filter_zero_size | \
 	sed -e "s/\(Total devices\) $NUMDEVS/\1 $NUM_SUBST/g" | \
 	uniq
 }
-- 
1.8.4.2

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

[PATCH 1/2 v2] xfstests: make btrfs/001.out in line with subvol delete output

[Anand Jain]

From: Anand Jain <Anand.Jain@oracle.com>

btrfs/001 is failing as the below btrfs-progs patch changed the
output during subvol delete.
Patch :
btrfs-progs: add options to set commit mode after subvol delete

adding it to the filter

Signed-off-by: Anand Jain <Anand.Jain@oracle.com>
---
 v2: accepts Wang suggested

 common/filter       |    4 ++++
 common/filter.btrfs |    6 ++++++
 tests/btrfs/001     |    3 ++-
 3 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/common/filter b/common/filter
index c872a27..3842c1b 100644
--- a/common/filter
+++ b/common/filter
@@ -313,5 +313,9 @@ _filter_ro_mount() {
 	    -e "s/mount: cannot mount block device/mount: cannot mount/g"
 }
 
+_filter_transcation_commit_default() {
+	sed -e "/Transaction commit: none (default)/d"
+}
+
 # make sure this script returns success
 /bin/true
diff --git a/common/filter.btrfs b/common/filter.btrfs
index 29512cd..563dff4 100644
--- a/common/filter.btrfs
+++ b/common/filter.btrfs
@@ -56,5 +56,11 @@ _filter_btrfs_device_stats()
 	sed -e "s/ *$NUMDEVS /<NUMDEVS> /g"
 }
 
+_filter_btrfs_subvol_delete()
+{
+	_filter_scratch | _filter_transcation_commit_default
+
+}
+
 # make sure this script returns success
 /bin/true
diff --git a/tests/btrfs/001 b/tests/btrfs/001
index c05d772..8258d06 100755
--- a/tests/btrfs/001
+++ b/tests/btrfs/001
@@ -40,6 +40,7 @@ trap "_cleanup ; exit \$status" 0 1 2 3 15
 # get standard environment, filters and checks
 . ./common/rc
 . ./common/filter
+. ./common/filter.btrfs
 
 # real QA test starts here
 _supported_fs btrfs
@@ -98,7 +99,7 @@ echo "Listing subvolumes"
 $BTRFS_UTIL_PROG subvolume list $SCRATCH_MNT | awk '{ print $NF }'
 
 # Delete the snapshot
-$BTRFS_UTIL_PROG subvolume delete $SCRATCH_MNT/snap | _filter_scratch
+$BTRFS_UTIL_PROG subvolume delete $SCRATCH_MNT/snap | _filter_btrfs_subvol_delete
 echo "List root dir"
 ls $SCRATCH_MNT
 _scratch_remount
-- 
1.7.1

Re: [PATCH 1/2 v2] xfstests: make btrfs/001.out in line with subvol delete output

[David Sterba]

On Tue, Jan 14, 2014 at 11:23:48AM +0800, Anand Jain wrote:
> --- a/common/filter
> +++ b/common/filter
> @@ -313,5 +313,9 @@ _filter_ro_mount() {
>  	    -e "s/mount: cannot mount block device/mount: cannot mount/g"
>  }
>  
> +_filter_transcation_commit_default() {
> +	sed -e "/Transaction commit: none (default)/d"
> +}

This IMO belongs to filters.btrfs

> +
>  # make sure this script returns success
>  /bin/true

[PATCH 1/2 v3] xfstests: make btrfs/001.out in line with subvol delete output

[Anand Jain]

From: Anand Jain <Anand.Jain@oracle.com>

btrfs/001 is failing as the below btrfs-progs patch changed the
output during subvol delete.
Patch :
btrfs-progs: add options to set commit mode after subvol delete

adding it to the filter

Signed-off-by: Anand Jain <Anand.Jain@oracle.com>
---
 v3: takes in David suggested
 v2: accepts Wang suggested

 common/filter.btrfs |   10 ++++++++++
 tests/btrfs/001     |    3 ++-
 2 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/common/filter.btrfs b/common/filter.btrfs
index 29512cd..b81ac49 100644
--- a/common/filter.btrfs
+++ b/common/filter.btrfs
@@ -56,5 +56,15 @@ _filter_btrfs_device_stats()
 	sed -e "s/ *$NUMDEVS /<NUMDEVS> /g"
 }
 
+_filter_transcation_commit_default() {
+	sed -e "/Transaction commit: none (default)/d"
+}
+
+_filter_btrfs_subvol_delete()
+{
+	_filter_scratch | _filter_transcation_commit_default
+
+}
+
 # make sure this script returns success
 /bin/true
diff --git a/tests/btrfs/001 b/tests/btrfs/001
index c05d772..8258d06 100755
--- a/tests/btrfs/001
+++ b/tests/btrfs/001
@@ -40,6 +40,7 @@ trap "_cleanup ; exit \$status" 0 1 2 3 15
 # get standard environment, filters and checks
 . ./common/rc
 . ./common/filter
+. ./common/filter.btrfs
 
 # real QA test starts here
 _supported_fs btrfs
@@ -98,7 +99,7 @@ echo "Listing subvolumes"
 $BTRFS_UTIL_PROG subvolume list $SCRATCH_MNT | awk '{ print $NF }'
 
 # Delete the snapshot
-$BTRFS_UTIL_PROG subvolume delete $SCRATCH_MNT/snap | _filter_scratch
+$BTRFS_UTIL_PROG subvolume delete $SCRATCH_MNT/snap | _filter_btrfs_subvol_delete
 echo "List root dir"
 ls $SCRATCH_MNT
 _scratch_remount
-- 
1.7.1

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

[PATCH 1/2 v3] xfstests: make btrfs/001.out in line with subvol delete output

[Anand Jain]

From: Anand Jain <Anand.Jain@oracle.com>

btrfs/001 is failing as the below btrfs-progs patch changed the
output during subvol delete.
Patch :
btrfs-progs: add options to set commit mode after subvol delete

adding it to the filter

Signed-off-by: Anand Jain <Anand.Jain@oracle.com>
---
 v3: takes in David suggested
 v2: accepts Wang suggested

 common/filter.btrfs |   10 ++++++++++
 tests/btrfs/001     |    3 ++-
 2 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/common/filter.btrfs b/common/filter.btrfs
index 29512cd..b81ac49 100644
--- a/common/filter.btrfs
+++ b/common/filter.btrfs
@@ -56,5 +56,15 @@ _filter_btrfs_device_stats()
 	sed -e "s/ *$NUMDEVS /<NUMDEVS> /g"
 }
 
+_filter_transcation_commit_default() {
+	sed -e "/Transaction commit: none (default)/d"
+}
+
+_filter_btrfs_subvol_delete()
+{
+	_filter_scratch | _filter_transcation_commit_default
+
+}
+
 # make sure this script returns success
 /bin/true
diff --git a/tests/btrfs/001 b/tests/btrfs/001
index c05d772..8258d06 100755
--- a/tests/btrfs/001
+++ b/tests/btrfs/001
@@ -40,6 +40,7 @@ trap "_cleanup ; exit \$status" 0 1 2 3 15
 # get standard environment, filters and checks
 . ./common/rc
 . ./common/filter
+. ./common/filter.btrfs
 
 # real QA test starts here
 _supported_fs btrfs
@@ -98,7 +99,7 @@ echo "Listing subvolumes"
 $BTRFS_UTIL_PROG subvolume list $SCRATCH_MNT | awk '{ print $NF }'
 
 # Delete the snapshot
-$BTRFS_UTIL_PROG subvolume delete $SCRATCH_MNT/snap | _filter_scratch
+$BTRFS_UTIL_PROG subvolume delete $SCRATCH_MNT/snap | _filter_btrfs_subvol_delete
 echo "List root dir"
 ls $SCRATCH_MNT
 _scratch_remount
-- 
1.7.1

[PATCH 1/2 v3] xfstests: make btrfs/001.out in line with subvol delete output

[Anand Jain]

From: Anand Jain <Anand.Jain@oracle.com>

btrfs/001 is failing as the below btrfs-progs patch changed the
output during subvol delete.
Patch :
btrfs-progs: add options to set commit mode after subvol delete

adding it to the filter

Signed-off-by: Anand Jain <Anand.Jain@oracle.com>
---
 v3: takes in David suggested
 v2: accepts Wang suggested

 common/filter.btrfs |   10 ++++++++++
 tests/btrfs/001     |    3 ++-
 2 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/common/filter.btrfs b/common/filter.btrfs
index 29512cd..b81ac49 100644
--- a/common/filter.btrfs
+++ b/common/filter.btrfs
@@ -56,5 +56,15 @@ _filter_btrfs_device_stats()
 	sed -e "s/ *$NUMDEVS /<NUMDEVS> /g"
 }
 
+_filter_transcation_commit_default() {
+	sed -e "/Transaction commit: none (default)/d"
+}
+
+_filter_btrfs_subvol_delete()
+{
+	_filter_scratch | _filter_transcation_commit_default
+
+}
+
 # make sure this script returns success
 /bin/true
diff --git a/tests/btrfs/001 b/tests/btrfs/001
index c05d772..8258d06 100755
--- a/tests/btrfs/001
+++ b/tests/btrfs/001
@@ -40,6 +40,7 @@ trap "_cleanup ; exit \$status" 0 1 2 3 15
 # get standard environment, filters and checks
 . ./common/rc
 . ./common/filter
+. ./common/filter.btrfs
 
 # real QA test starts here
 _supported_fs btrfs
@@ -98,7 +99,7 @@ echo "Listing subvolumes"
 $BTRFS_UTIL_PROG subvolume list $SCRATCH_MNT | awk '{ print $NF }'
 
 # Delete the snapshot
-$BTRFS_UTIL_PROG subvolume delete $SCRATCH_MNT/snap | _filter_scratch
+$BTRFS_UTIL_PROG subvolume delete $SCRATCH_MNT/snap | _filter_btrfs_subvol_delete
 echo "List root dir"
 ls $SCRATCH_MNT
 _scratch_remount
-- 
1.7.1

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs