Skip to contentSkip to conversation

xfstests: don't remove trailing zeros from integers

PATCH Superseded Eric Whitney 2 participants 4 messages Mar 1, 2013

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 xfstests: don't remove trailing zeros from integers

_within_tolerance strips trailing zeros from the min and max range values it outputs. This leads to damage if the min or max value is an integer containing trailing zeros rather than a real number with a fractional part containing trailing zeros. Xfstest 289 can exhibit this problem when its input is out of range. Modify the code so it will only remove trailing zeros found after a decimal point.

---
 common.filter |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
common.filter +4 -2
index 9e4c90c..1df2f97 100644
@@ -106,8 +106,10 @@ EOF
 
   # fix up min, max precision for output
   # can vary for 5.3, 6.2
-  _min=`echo $_min | sed -e 's/0*$//'` # get rid of trailling zeroes
-  _max=`echo $_max | sed -e 's/0*$//'` # get rid of trailling zeroes
+
+  # remove any trailing zeroes from min, max if they have fractional parts
+  _min=`echo $_min | sed -e '/\./s/0*$//'`
+  _max=`echo $_max | sed -e '/\./s/0*$//'`
 
   if [ $_in_range -eq 1 ] 
   then
Signature · 6 lines
1.7.10.4

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
Reviewed-by on v1 1/1
#1 lore raw
Quoted 6 lines · Eric Whitney

_within_tolerance strips trailing zeros from the min and max range values it outputs. This leads to damage if the min or max value is an integer containing trailing zeros rather than a real number with a fractional part containing trailing zeros. Xfstest 289 can exhibit this problem when its input is out of range. Modify the code so it will only remove trailing zeros found after a decimal point.

whoops, that's not too good.

It's only for the output message in a failure case though, correct? But it makes the error output unhelpful.

Seems a little weird that it still leaves the trailing decimal:

$ echo 20000.00 | sed -e '/\./s/0*$//'
20000.

but that's not a big deal. The patch makes it better and the output is understandable even if it has a trailing decimal (which it had before anyway) so:

Quoted 13 lines
---
 common.filter |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
common.filter +0 -0
index 9e4c90c..1df2f97 100644
@@ -106,8 +106,10 @@ EOF
 
   # fix up min, max precision for output

common.filter EOF · line 115

Quoted 10 lines
common.filter +4 -2
   # can vary for 5.3, 6.2
-  _min=`echo $_min | sed -e 's/0*$//'` # get rid of trailling zeroes
-  _max=`echo $_max | sed -e 's/0*$//'` # get rid of trailling zeroes
+
+  # remove any trailing zeroes from min, max if they have fractional parts
+  _min=`echo $_min | sed -e '/\./s/0*$//'`
+  _max=`echo $_max | sed -e '/\./s/0*$//'`
 
   if [ $_in_range -eq 1 ] 
   then

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

#2 lore raw

* Eric Sandeen <[email protected]>:

Quoted 8 lines · Eric Whitney
Quoted 6 lines

_within_tolerance strips trailing zeros from the min and max range values it outputs. This leads to damage if the min or max value is an integer containing trailing zeros rather than a real number with a fractional part containing trailing zeros. Xfstest 289 can exhibit this problem when its input is out of range. Modify the code so it will only remove trailing zeros found after a decimal point.

Quoted 4 lines

whoops, that's not too good.

It's only for the output message in a failure case though, correct? But it makes the error output unhelpful.

Right on both counts. We'd noticed the error output was confusing a few months ago when you fixed an ext4 free space reporting problem (this is an IOU) - 1280000 reported as 128 in that case.

Quoted 11 lines

Seems a little weird that it still leaves the trailing decimal:

$ echo 20000.00 | sed -e '/\./s/0*$//'
20000.

but that's not a big deal. The patch makes it better and the output is understandable even if it has a trailing decimal (which it had before anyway) so:

I'd reached the same conclusion, but if preferred I'll take this farther and eliminate the trailing decimal.

Thanks for the review!

Eric

Quoted 21 lines
Quoted 21 lines
---
 common.filter |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
common.filter +4 -2
index 9e4c90c..1df2f97 100644
@@ -106,8 +106,10 @@ EOF
 
   # fix up min, max precision for output
   # can vary for 5.3, 6.2
-  _min=`echo $_min | sed -e 's/0*$//'` # get rid of trailling zeroes
-  _max=`echo $_max | sed -e 's/0*$//'` # get rid of trailling zeroes
+
+  # remove any trailing zeroes from min, max if they have fractional parts
+  _min=`echo $_min | sed -e '/\./s/0*$//'`
+  _max=`echo $_max | sed -e '/\./s/0*$//'`
 
Quoted 4 lines

common.filter EOF · line 115

Quoted 3 lines
common.filter +0 -0
   if [ $_in_range -eq 1 ] 
   then

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

#3 lore raw

* Eric Whitney <[email protected]>:

Quoted 24 lines

* Eric Sandeen <[email protected]>:

Quoted 8 lines · Eric Whitney
Quoted 6 lines

_within_tolerance strips trailing zeros from the min and max range values it outputs. This leads to damage if the min or max value is an integer containing trailing zeros rather than a real number with a fractional part containing trailing zeros. Xfstest 289 can exhibit this problem when its input is out of range. Modify the code so it will only remove trailing zeros found after a decimal point.

Quoted 4 lines

whoops, that's not too good.

It's only for the output message in a failure case though, correct? But it makes the error output unhelpful.

Right on both counts. We'd noticed the error output was confusing a few months ago when you fixed an ext4 free space reporting problem (this is an IOU) - 1280000 reported as 128 in that case.

Quoted 6 lines

Seems a little weird that it still leaves the trailing decimal:

$ echo 20000.00 | sed -e '/\./s/0*$//'
20000.
Quoted 9 lines
Quoted 5 lines

but that's not a big deal. The patch makes it better and the output is understandable even if it has a trailing decimal (which it had before anyway) so:

I'd reached the same conclusion, but if preferred I'll take this farther and eliminate the trailing decimal.

On further consideration, it's easy enough to clean up the trailing decimal and it's just better that way, even for an error case. There's at least one fix that isn't elegant but works. I'll send along a V2 shortly.

Regards,
Eric

Quoted 29 lines

Thanks for the review!

Eric

Quoted 25 lines
Quoted 24 lines
---
 common.filter |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
common.filter +4 -2
index 9e4c90c..1df2f97 100644
@@ -106,8 +106,10 @@ EOF
 
   # fix up min, max precision for output
   # can vary for 5.3, 6.2
-  _min=`echo $_min | sed -e 's/0*$//'` # get rid of trailling zeroes
-  _max=`echo $_max | sed -e 's/0*$//'` # get rid of trailling zeroes
+
+  # remove any trailing zeroes from min, max if they have fractional parts
+  _min=`echo $_min | sed -e '/\./s/0*$//'`
+  _max=`echo $_max | sed -e '/\./s/0*$//'`
 
   if [ $_in_range -eq 1 ] 
   then

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