Skip to contentSkip to conversation

xfstests generic/260: get correct trimmed bytes

PATCH Superseded Eryu Guan 3 participants 5 messages Oct 3, 2013 – Oct 16, 2013

lore
Share & tools
lore

Eryu Guan

author
#0 lore raw

PATCH 1/1 xfstests generic/260: get correct trimmed bytes

Newer fstrim(1) reports trimmed bytes differently, e.g.

new fstrim: /mnt/ext4: 9.7 GiB (10411118592 bytes) trimmed old fstrim: /mnt/ext4: 10411118592 bytes were trimmed

generic/260 reports syntax error

    +./tests/generic/260: line 111: [: 9.7: integer expression expected
    +./tests/generic/260: line 121: [: 9.7: integer expression expected
    +./tests/generic/260: line 183: [: 9.7: integer expression expected

Fix it so 260 passes with both old and new fstrim.

---
 tests/generic/260 | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)
tests/generic/260 +4 -6
index dc8b822..bc9eb3b 100755
@@ -104,9 +104,8 @@ _scratch_mount
 # This is a bit fuzzy, but since the file system is fresh
 # there should be at least (fssize/2) free space to trim.
 # This is supposed to catch wrong FITRIM argument handling
-out=$($FSTRIM_PROG -v -o10M $SCRATCH_MNT)
-nopref=${out##*: }
-bytes=${nopref%% *}
+out=$($FSTRIM_PROG -v -o10M $SCRATCH_MNT | egrep -o "[0-9]+ bytes")
+bytes=${out%% *}
 
 if [ $bytes -gt $(_math "$fssize*1024") ]; then
 	status=1
@@ -177,9 +176,8 @@ _scratch_mount
 # It is because btrfs does not have not-yet-used parts of the device
 # mapped and since we got here right after the mkfs, there is not
 # enough free extents in the root tree.
-out=$($FSTRIM_PROG -v -l$len $SCRATCH_MNT)
-nopref=${out##*: }
-bytes=${nopref%% *}
+out=$($FSTRIM_PROG -v -l$len $SCRATCH_MNT | egrep -o "[0-9]+ bytes")
+bytes=${out%% *}
 if [ $bytes -le $(_math "$fssize*512") ] && [ $FSTYP != "btrfs" ]; then
 	status=1
 	echo "It seems that fs logic handling len argument overflows"
Signature · 6 lines
1.8.3.1

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
#1 lore raw
Quoted 23 lines · Eryu Guan

Newer fstrim(1) reports trimmed bytes differently, e.g.

new fstrim: /mnt/ext4: 9.7 GiB (10411118592 bytes) trimmed old fstrim: /mnt/ext4: 10411118592 bytes were trimmed

generic/260 reports syntax error

    +./tests/generic/260: line 111: [: 9.7: integer expression expected
    +./tests/generic/260: line 121: [: 9.7: integer expression expected
    +./tests/generic/260: line 183: [: 9.7: integer expression expected

Fix it so 260 passes with both old and new fstrim.

---
 tests/generic/260 | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)
tests/generic/260 +0 -0
index dc8b822..bc9eb3b 100755

tests/generic/260 _scratch_mount · line 108

Quoted 8 lines
tests/generic/260 +2 -3
@@ -104,9 +104,8 @@ _scratch_mount
 # This is a bit fuzzy, but since the file system is fresh
 # there should be at least (fssize/2) free space to trim.
 # This is supposed to catch wrong FITRIM argument handling
-out=$($FSTRIM_PROG -v -o10M $SCRATCH_MNT)
-nopref=${out##*: }
-bytes=${nopref%% *}
+out=$($FSTRIM_PROG -v -o10M $SCRATCH_MNT | egrep -o "[0-9]+ bytes")
+bytes=${out%% *}

Can you add this as a "_filter_fstrim" function to common/filter with a comment explaining what version of fstrim the output changed in?

Cheers,

Dave.

Signature · 7 lines
Dave Chinner
[email protected]

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
author
#2 lore raw

PATCH v2 1/1 xfstests generic/260: get correct trimmed bytes

Starting from util-linux v2.23 fstrim(1) reports trimmed bytes differently, e.g.

new fstrim: /mnt/ext4: 9.7 GiB (10411118592 bytes) trimmed old fstrim: /mnt/ext4: 10411118592 bytes were trimmed

generic/260 reports syntax error

    +./tests/generic/260: line 111: [: 9.7: integer expression expected
    +./tests/generic/260: line 121: [: 9.7: integer expression expected
    +./tests/generic/260: line 183: [: 9.7: integer expression expected

Add a new filter called _filter_fstrim in common/filter and get the correct trimmed bytes in generic/260, so the test passes with both old and new fstrim.

---
v2: add _filter_fstrim to filter the output as Dave suggested

 common/filter     | 8 ++++++++
 tests/generic/260 | 8 ++------
 2 files changed, 10 insertions(+), 6 deletions(-)
common/filter +8 -0
index ee738ca..9144863 100644
@@ -280,5 +280,13 @@ _filter_size_to_bytes()
 	echo $((${size:0:${#size}-1}*$mul))
 }
 
+# Print trimmed bytes of fstrim
+# Starting from util-linux v2.23 fstrim usees human readable sizes in
+# verbose output
+_filter_fstrim()
+{
+	egrep -o "[0-9]+ bytes" | $AWK_PROG '{print $1}'
+}
+
 # make sure this script returns success
 /bin/true
tests/generic/260 +2 -6
index dc8b822..a003a7f 100755
@@ -104,9 +104,7 @@ _scratch_mount
 # This is a bit fuzzy, but since the file system is fresh
 # there should be at least (fssize/2) free space to trim.
 # This is supposed to catch wrong FITRIM argument handling
-out=$($FSTRIM_PROG -v -o10M $SCRATCH_MNT)
-nopref=${out##*: }
-bytes=${nopref%% *}
+bytes=$($FSTRIM_PROG -v -o10M $SCRATCH_MNT | _filter_fstrim)
 
 if [ $bytes -gt $(_math "$fssize*1024") ]; then
 	status=1
@@ -177,9 +175,7 @@ _scratch_mount
 # It is because btrfs does not have not-yet-used parts of the device
 # mapped and since we got here right after the mkfs, there is not
 # enough free extents in the root tree.
-out=$($FSTRIM_PROG -v -l$len $SCRATCH_MNT)
-nopref=${out##*: }
-bytes=${nopref%% *}
+bytes=$($FSTRIM_PROG -v -l$len $SCRATCH_MNT | _filter_fstrim)
 if [ $bytes -le $(_math "$fssize*512") ] && [ $FSTYP != "btrfs" ]; then
 	status=1
 	echo "It seems that fs logic handling len argument overflows"
Signature · 6 lines
1.8.3.1

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
Reviewed-by on v2 1/1
#3 lore raw
Quoted 12 lines · Eryu Guan

Starting from util-linux v2.23 fstrim(1) reports trimmed bytes differently, e.g.

new fstrim: /mnt/ext4: 9.7 GiB (10411118592 bytes) trimmed old fstrim: /mnt/ext4: 10411118592 bytes were trimmed

generic/260 reports syntax error

    +./tests/generic/260: line 111: [: 9.7: integer expression expected
    +./tests/generic/260: line 121: [: 9.7: integer expression expected
    +./tests/generic/260: line 183: [: 9.7: integer expression expected
Quoted 7 lines

Add a new filter called _filter_fstrim in common/filter and get the correct trimmed bytes in generic/260, so the test passes with both old and new fstrim.

---
v2: add _filter_fstrim to filter the output as Dave suggested

Looks good!

Signature · 7 lines
Dave Chinner
[email protected]

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs