Skip to content

Fix format_quantity precision and emit canonical decimal output #2625

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kubernetes-prow merged 1 commit into from
Jul 7, 2026
+24 −6
Merged

Fix format_quantity precision and emit canonical decimal output #2625

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 21 additions & 3 deletions kubernetes/e2e_test/test_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -757,9 +757,11 @@ def test_format_quantity(self):
"0.3Gi")

# == base 1000 ==
self.assertEqual(quantity.format_quantity(Decimal(0.000_000_001), "n"), "1n")
self.assertEqual(quantity.format_quantity(Decimal(0.000_001), "u"), "1u")
self.assertEqual(quantity.format_quantity(Decimal(0.001), "m"), "1m")
# Exact Decimals: float-derived Decimals (e.g. Decimal(0.001)) carry binary
# rounding error that the precise scaling surfaces into the output.
self.assertEqual(quantity.format_quantity(Decimal("0.000000001"), "n"), "1n")
self.assertEqual(quantity.format_quantity(Decimal("0.000001"), "u"), "1u")
self.assertEqual(quantity.format_quantity(Decimal("0.001"), "m"), "1m")
self.assertEqual(quantity.format_quantity(Decimal(1_000), "k"), "1k")
self.assertEqual(quantity.format_quantity(Decimal(1_000_000), "M"), "1M")
self.assertEqual(quantity.format_quantity(Decimal(1_000_000_000), "G"), "1G")
Expand All @@ -781,3 +783,19 @@ def test_format_quantity(self):
),
"333k",
)

# == milli/micro/nano keep full precision in canonical decimal form ==
# Regression: these divided by a float-built Decimal and rendered in
# scientific notation (e.g. "499.9999999999999895916591441m", "1E+9").
self.assertEqual(quantity.format_quantity(Decimal("0.5"), "m"), "500m")
self.assertEqual(quantity.format_quantity(Decimal("0.5"), "u"), "500000u")
self.assertEqual(quantity.format_quantity(Decimal("0.5"), "n"), "500000000n")
self.assertEqual(quantity.format_quantity(Decimal("1"), "m"), "1000m")
self.assertEqual(quantity.format_quantity(Decimal("1"), "n"), "1000000000n")

# == quantize=Decimal(0) is honored, not treated as falsy ==
self.assertEqual(quantity.format_quantity(Decimal("0.5006"), "m"), "500.6m")
self.assertEqual(
quantity.format_quantity(Decimal("0.5006"), "m", quantize=Decimal(0)),
"501m",
)
6 changes: 3 additions & 3 deletions kubernetes/utils/quantity.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ def format_quantity(quantity_value, suffix, quantize=None) -> str:
if suffix[0] not in _EXPONENTS:
raise ValueError(f"{quantity_value} has unknown suffix")

different_scale = quantity_value / Decimal(base ** _EXPONENTS[suffix[0]])
if quantize:
different_scale = quantity_value / (Decimal(base) ** _EXPONENTS[suffix[0]])
if quantize is not None:
different_scale = different_scale.quantize(quantize)
return str(different_scale) + suffix
return format(different_scale, "f") + suffix