so the frontend has the information readily available.
Suggested-by: Thomas Lamprecht <t.lampre...@proxmox.com>
Signed-off-by: Fiona Ebner <f.eb...@proxmox.com>
---
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
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
