applied to master & stable-4
On Fri, Oct 06, 2017 at 03:52:15PM +0200, Philip Abernethy wrote:
> this fixes the disk I/O graph and now also correctly sums the values.
> ---
> This fix is already somewhat obsoleted by cgroup v2, but targetting
> that will me much more effort.
> src/PVE/LXC.pm | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/src/PVE/LXC.pm b/src/PVE/LXC.pm
> index bce032a..6246e7b 100644
> --- a/src/PVE/LXC.pm
> +++ b/src/PVE/LXC.pm
> @@ -197,8 +197,8 @@ sub vmstatus {
> my @bytes = split(/\n/, $blkio_bytes);
> foreach my $byte (@bytes) {
> if (my ($key, $value) = $byte =~ /(Read|Write)\s+(\d+)/) {
> - $d->{diskread} = $2 if $key eq 'Read';
> - $d->{diskwrite} = $2 if $key eq 'Write';
> + $d->{diskread} += $2 if $key eq 'Read';
> + $d->{diskwrite} += $2 if $key eq 'Write';
> }
> }
>
> @@ -260,7 +260,7 @@ sub read_cgroup_list {
> sub read_cgroup_value {
> my ($group, $vmid, $name, $full) = @_;
>
> - my $path = "/sys/fs/cgroup/$group/lxc/$vmid/$name";
> + my $path = "/sys/fs/cgroup/$group/lxc/$vmid/ns/$name";
>
> return PVE::Tools::file_get_contents($path) if $full;
>
> --
> 2.11.0
_______________________________________________
pve-devel mailing list
pve-devel@pve.proxmox.com
https://pve.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
