[pve-devel] [PATCH container] vm status: force int where appropriate

[pve-devel] [PATCH container] vm status: force int where appropriate

[Fabian Ebner]

In the case of a running container with cgroupv2, swap would be a string,
causing a
    size.toFixed is not a function
error for the format_size call in the containers's "Summary" page in the UI.

The 'vmid' is still a string, because the property is injected via the 'links'
property in the return type schema.

Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
---
 src/PVE/LXC.pm | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/PVE/LXC.pm b/src/PVE/LXC.pm
index bb1cbdb..1ec4818 100644
--- a/src/PVE/LXC.pm
+++ b/src/PVE/LXC.pm
@@ -187,7 +187,7 @@ sub vmstatus {
     foreach my $vmid (keys %$list) {
 	my $d = $list->{$vmid};
 
-	eval { $d->{pid} = find_lxc_pid($vmid) if defined($active_hash->{$vmid}); };
+	eval { $d->{pid} = int(find_lxc_pid($vmid)) if defined($active_hash->{$vmid}); };
 	warn $@ if $@; # ignore errors (consider them stopped)
 
 	$d->{status} = $active_hash->{$vmid} ? 'running' : 'stopped';
@@ -207,8 +207,8 @@ sub vmstatus {
 
 	if ($d->{pid}) {
 	    my $res = get_container_disk_usage($vmid, $d->{pid});
-	    $d->{disk} = $res->{used};
-	    $d->{maxdisk} = $res->{total};
+	    $d->{disk} = int($res->{used});
+	    $d->{maxdisk} = int($res->{total});
 	} else {
 	    $d->{disk} = 0;
 	    # use 4GB by default ??
@@ -252,16 +252,16 @@ sub vmstatus {
 	my $cgroups = PVE::LXC::CGroup->new($vmid);
 
 	if (defined(my $mem = $cgroups->get_memory_stat())) {
-	    $d->{mem} = $mem->{mem};
-	    $d->{swap} = $mem->{swap};
+	    $d->{mem} = int($mem->{mem});
+	    $d->{swap} = int($mem->{swap});
 	} else {
 	    $d->{mem} = 0;
 	    $d->{swap} = 0;
 	}
 
 	if (defined(my $blkio = $cgroups->get_io_stats())) {
-	    $d->{diskread} = $blkio->{diskread};
-	    $d->{diskwrite} = $blkio->{diskwrite};
+	    $d->{diskread} = int($blkio->{diskread});
+	    $d->{diskwrite} = int($blkio->{diskwrite});
 	} else {
 	    $d->{diskread} = 0;
 	    $d->{diskwrite} = 0;
-- 
2.30.2

[pve-devel] [PATCH qemu-server] vm status: force int where appropriate

[Fabian Ebner]

to avoid potential problems with stringified numbers in Javascript and
elsewehere.

The 'vmid' is still a string, because the property is injected via the 'links'
property in the return type schema.

Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
---
 PVE/QemuServer.pm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index 25ac052..2cad00b 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -2652,7 +2652,7 @@ sub vmstatus {
 	my $conf = PVE::QemuConfig->load_config($vmid);
 
 	my $d = { vmid => $vmid };
-	$d->{pid} = $list->{$vmid}->{pid};
+	$d->{pid} = int($list->{$vmid}->{pid});
 
 	# fixme: better status?
 	$d->{status} = $list->{$vmid}->{pid} ? 'running' : 'stopped';
@@ -2711,8 +2711,8 @@ sub vmstatus {
 	$d->{netin} += $netdev->{$dev}->{transmit};
 
 	if ($full) {
-	    $d->{nics}->{$dev}->{netout} = $netdev->{$dev}->{receive};
-	    $d->{nics}->{$dev}->{netin} = $netdev->{$dev}->{transmit};
+	    $d->{nics}->{$dev}->{netout} = int($netdev->{$dev}->{receive});
+	    $d->{nics}->{$dev}->{netin} = int($netdev->{$dev}->{transmit});
 	}
 
     }
-- 
2.30.2

Re: [pve-devel] [PATCH container] vm status: force int where appropriate

[Fabian Ebner]

Am 31.05.21 um 16:37 schrieb Fabian Ebner:
> In the case of a running container with cgroupv2, swap would be a string,
> causing a
>      size.toFixed is not a function
> error for the format_size call in the containers's "Summary" page in the UI.
> 
> The 'vmid' is still a string, because the property is injected via the 'links'
> property in the return type schema.

This is false, I missed where the vmid is assigned...
I'll send a v2, sorry for the noise.

> 
> Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
> ---
>   src/PVE/LXC.pm | 14 +++++++-------
>   1 file changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/src/PVE/LXC.pm b/src/PVE/LXC.pm
> index bb1cbdb..1ec4818 100644
> --- a/src/PVE/LXC.pm
> +++ b/src/PVE/LXC.pm
> @@ -187,7 +187,7 @@ sub vmstatus {
>       foreach my $vmid (keys %$list) {
>   	my $d = $list->{$vmid};
>   
> -	eval { $d->{pid} = find_lxc_pid($vmid) if defined($active_hash->{$vmid}); };
> +	eval { $d->{pid} = int(find_lxc_pid($vmid)) if defined($active_hash->{$vmid}); };
>   	warn $@ if $@; # ignore errors (consider them stopped)
>   
>   	$d->{status} = $active_hash->{$vmid} ? 'running' : 'stopped';
> @@ -207,8 +207,8 @@ sub vmstatus {
>   
>   	if ($d->{pid}) {
>   	    my $res = get_container_disk_usage($vmid, $d->{pid});
> -	    $d->{disk} = $res->{used};
> -	    $d->{maxdisk} = $res->{total};
> +	    $d->{disk} = int($res->{used});
> +	    $d->{maxdisk} = int($res->{total});
>   	} else {
>   	    $d->{disk} = 0;
>   	    # use 4GB by default ??
> @@ -252,16 +252,16 @@ sub vmstatus {
>   	my $cgroups = PVE::LXC::CGroup->new($vmid);
>   
>   	if (defined(my $mem = $cgroups->get_memory_stat())) {
> -	    $d->{mem} = $mem->{mem};
> -	    $d->{swap} = $mem->{swap};
> +	    $d->{mem} = int($mem->{mem});
> +	    $d->{swap} = int($mem->{swap});
>   	} else {
>   	    $d->{mem} = 0;
>   	    $d->{swap} = 0;
>   	}
>   
>   	if (defined(my $blkio = $cgroups->get_io_stats())) {
> -	    $d->{diskread} = $blkio->{diskread};
> -	    $d->{diskwrite} = $blkio->{diskwrite};
> +	    $d->{diskread} = int($blkio->{diskread});
> +	    $d->{diskwrite} = int($blkio->{diskwrite});
>   	} else {
>   	    $d->{diskread} = 0;
>   	    $d->{diskwrite} = 0;
>