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 DB4728E208 for ; Thu, 10 Nov 2022 15:38:37 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id BDEFB287C9 for ; Thu, 10 Nov 2022 15:38:07 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (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 firstgate.proxmox.com (Proxmox) with ESMTPS for ; Thu, 10 Nov 2022 15:38:05 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 8DBC444B58 for ; Thu, 10 Nov 2022 15:38:05 +0100 (CET) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Thu, 10 Nov 2022 15:37:46 +0100 Message-Id: <20221110143800.98047-8-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221110143800.98047-1-f.ebner@proxmox.com> References: <20221110143800.98047-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.028 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH v3 manager 2/3] cluster resources: add cgroup-mode to node properties 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: Thu, 10 Nov 2022 14:38:37 -0000 so the frontend has the information readily available. Suggested-by: Thomas Lamprecht Signed-off-by: Fiona Ebner --- Changes from v2: * Add it to the new 'static-info' kv instead of being standalone. * Fix params for get_node_kv() call (already in previous patch). PVE/API2/Cluster.pm | 13 +++++++++++++ PVE/Service/pvestatd.pm | 5 +++++ 2 files changed, 18 insertions(+) diff --git a/PVE/API2/Cluster.pm b/PVE/API2/Cluster.pm index 49e319a5..dc575d85 100644 --- a/PVE/API2/Cluster.pm +++ b/PVE/API2/Cluster.pm @@ -323,6 +323,11 @@ __PACKAGE__->register_method({ optional => 1, minimum => 1, }, + 'cgroup-mode' => { + description => "The cgroup mode the node operates under (when type == node).", + type => 'integer', + optional => 1, + }, }, }, }, @@ -427,10 +432,18 @@ __PACKAGE__->register_method({ } } + my $static_node_info = PVE::Cluster::get_node_kv("static-info"); + if (!$param->{type} || $param->{type} eq 'node') { foreach my $node (@$nodelist) { my $can_audit = $rpcenv->check($authuser, "/nodes/$node", [ 'Sys.Audit' ], 1); my $entry = PVE::API2Tools::extract_node_stats($node, $members, $rrd, !$can_audit); + + my $info = eval { decode_json($static_node_info->{$node}); }; + if (defined(my $mode = $info->{'cgroup-mode'})) { + $entry->{'cgroup-mode'} = int($mode); + } + push @$res, $entry; } } diff --git a/PVE/Service/pvestatd.pm b/PVE/Service/pvestatd.pm index eb0dc130..2515120c 100755 --- a/PVE/Service/pvestatd.pm +++ b/PVE/Service/pvestatd.pm @@ -126,17 +126,22 @@ my $generate_rrd_string = sub { my sub broadcast_static_node_info { my ($cpus, $memory) = @_; + my $cgroup_mode = eval { PVE::CGroup::cgroup_mode(); }; + syslog('err', "cgroup mode error: $@") if $@; + my $old = PVE::Cluster::get_node_kv('static-info', $nodename); $old = eval { decode_json($old->{$nodename}) } if defined($old->{$nodename}); if ( !defined($old->{cpus}) || $old->{cpus} != $cpus || !defined($old->{memory}) || $old->{memory} != $memory + || ($old->{'cgroup-mode'} // -1) != ($cgroup_mode // -1) ) { my $info = { cpus => $cpus, memory => $memory, }; + $info->{'cgroup-mode'} = $cgroup_mode if defined($cgroup_mode); PVE::Cluster::broadcast_node_kv('static-info', encode_json($info)); } } -- 2.30.2