[pve-devel] [PATCH common 1/5] fix #3900: schema: support and prefer sizes with verbose suffixes {K, M, G, T}iB

[Fiona Ebner]

The single-letter suffixes are ambiguous and especially in the context
of disks, the powers of ten are usually used. Proxmox VE uses
multiples of 1024 however. By adapting format_size() to use the verbose
suffixes all newly written or re-written sizes will use the more
verbose/explicit suffix.

The single-letter suffixes stay supported for backwards-compatibility
for API/CLI users as well as parsing backup configurations. The
function is currently also used for parsing the 'target-size' Ceph
pool option (still restricted via schema to single-letter suffixes).

NOTE: maybe it makes sense to wait for PVE 9 with this and do a
parse+write for all guest configs (including their snapshots) in
the pve8to9 script?

Signed-off-by: Fiona Ebner <f.eb...@proxmox.com>
---
 src/PVE/JSONSchema.pm | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/PVE/JSONSchema.pm b/src/PVE/JSONSchema.pm
index 7c63af1..1447924 100644
--- a/src/PVE/JSONSchema.pm
+++ b/src/PVE/JSONSchema.pm
@@ -880,16 +880,16 @@ sub check_format {
 sub parse_size {
     my ($value) = @_;
 
-    return undef if $value !~ m/^(\d+(\.\d+)?)([KMGT])?$/;
+    return undef if $value !~ m/^(\d+(\.\d+)?)([KMGT](?:iB)?)?$/;
     my ($size, $unit) = ($1, $3);
     if ($unit) {
-       if ($unit eq 'K') {
+       if ($unit eq 'K' || $unit eq 'KiB') {
            $size = $size * 1024;
-       } elsif ($unit eq 'M') {
+       } elsif ($unit eq 'M' || $unit eq 'MiB') {
            $size = $size * 1024 * 1024;
-       } elsif ($unit eq 'G') {
+       } elsif ($unit eq 'G' || $unit eq 'GiB') {
            $size = $size * 1024 * 1024 * 1024;
-       } elsif ($unit eq 'T') {
+       } elsif ($unit eq 'T' || $unit eq 'TiB') {
            $size = $size * 1024 * 1024 * 1024 * 1024;
        }
     }
@@ -905,15 +905,15 @@ sub format_size {
     return $size if $kb*1024 != $size;
 
     my $mb = int($kb/1024);
-    return "${kb}K" if $mb*1024 != $kb;
+    return "${kb}KiB" if $mb*1024 != $kb;
 
     my $gb = int($mb/1024);
-    return "${mb}M" if $gb*1024 != $mb;
+    return "${mb}MiB" if $gb*1024 != $mb;
 
     my $tb = int($gb/1024);
-    return "${gb}G" if $tb*1024 != $gb;
+    return "${gb}GiB" if $tb*1024 != $gb;
 
-    return "${tb}T";
+    return "${tb}TiB";
 };
 
 sub parse_boolean {
-- 
2.39.5



_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel