From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id BA47D7442E for ; Wed, 1 Jun 2022 10:13:05 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 092471A188 for ; Wed, 1 Jun 2022 10:13:05 +0200 (CEST) Received: from bastionodiso.odiso.net (bastionodiso.odiso.net [185.151.191.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id D5CEE1A0DF for ; Wed, 1 Jun 2022 10:13:01 +0200 (CEST) Received: from kvmformation3.odiso.net (formationkvm3.odiso.net [10.3.94.12]) by bastionodiso.odiso.net (Postfix) with ESMTP id 5282D34AEC; Wed, 1 Jun 2022 10:12:55 +0200 (CEST) Received: by kvmformation3.odiso.net (Postfix, from userid 0) id 4CEB9176722; Wed, 1 Jun 2022 10:12:55 +0200 (CEST) From: Alexandre Derumier To: pve-devel@lists.proxmox.com Cc: t.lamprecht@proxmox.com, Alexandre Derumier Date: Wed, 1 Jun 2022 10:12:49 +0200 Message-Id: <20220601081253.2542697-7-aderumier@odiso.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220601081253.2542697-1-aderumier@odiso.com> References: <20220601081253.2542697-1-aderumier@odiso.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.127 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% HEADER_FROM_DIFFERENT_DOMAINS 0.249 From and EnvelopeFrom 2nd level mail domains are different KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods NO_DNS_FOR_FROM 0.001 Envelope sender has no MX or A DNS records SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH pve-manager 2/4] pvestatd: qemu/lxc/node : add pressure stats X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Jun 2022 08:13:05 -0000 Signed-off-by: Alexandre Derumier --- PVE/Service/pvestatd.pm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/PVE/Service/pvestatd.pm b/PVE/Service/pvestatd.pm index 984877c1..dd578d6b 100755 --- a/PVE/Service/pvestatd.pm +++ b/PVE/Service/pvestatd.pm @@ -134,6 +134,7 @@ sub update_node_status { my $stat = PVE::ProcFSTools::read_proc_stat(); my $cpuinfo = PVE::ProcFSTools::read_cpuinfo(); my $maxcpu = $cpuinfo->{cpus}; + my $pressure = PVE::ProcFSTools::read_pressure(); update_supported_cpuflags(); @@ -170,10 +171,13 @@ sub update_node_status { memory => $meminfo, blockstat => $dinfo, nics => $netdev, + pressure => $pressure, }; $node_metric->{cpustat}->@{qw(avg1 avg5 avg15)} = ($avg1, $avg5, $avg15); $node_metric->{cpustat}->{cpus} = $maxcpu; + compute_pressure($ctime, $node_metric, 'node', $nodename); + my $transactions = PVE::ExtMetric::transactions_start($status_cfg); PVE::ExtMetric::update_all($transactions, 'node', $nodename, $node_metric, $ctime); PVE::ExtMetric::transactions_finish($transactions); @@ -227,6 +231,8 @@ sub update_qemu_status { [$d->{uptime}, $d->{name}, $status, $template, $ctime, $d->{cpus}, $d->{cpu}, $d->{maxmem}, $d->{mem}, $d->{maxdisk}, $d->{disk}, $d->{netin}, $d->{netout}, $d->{diskread}, $d->{diskwrite}]); + + compute_pressure($ctime, $d, 'qemu', $vmid); } else { $data = $generate_rrd_string->( [0, $d->{name}, $status, $template, $ctime, $d->{cpus}, undef, @@ -436,6 +442,7 @@ sub update_lxc_status { $d->{maxdisk}, $d->{disk}, $d->{netin}, $d->{netout}, $d->{diskread}, $d->{diskwrite}]); + compute_pressure($ctime, $d, 'lxc', $vmid); } else { $data = $generate_rrd_string->( [0, $d->{name}, $d->{status}, $template, $ctime, $d->{cpus}, undef, @@ -507,6 +514,33 @@ sub broadcast_balancer_stats { } } +sub compute_pressure { + my ($ctime, $d, $objecttype, $id) = @_; + + return if !defined($d->{pressure}); + my $pressure = $d->{pressure}; + + foreach my $type (keys %{$pressure}) { + my $pressuretype = $pressure->{$type}; + + foreach my $kind (keys %{$pressuretype}) { + next if $kind ne 'some'; + my $pressurekind = $pressuretype->{$kind}; + + foreach my $avg (keys %{$pressurekind}) { + next if $avg eq 'total'; + my $value = $pressurekind->{$avg}; + #for externel metric + my $metric = "pressure_".$type."_".$kind."_".$avg; + $d->{$metric} = $value; + next if $avg eq 'avg10'; + $balancer_stats->{$objecttype}->{$id}->{pressure}->{$type}->{$kind}->{$avg} = $value; + } + } + } + delete $d->{pressure}; +} + my $broadcast_version_info_done = 0; my sub broadcast_version_info : prototype() { if (!$broadcast_version_info_done) { -- 2.30.2