cluster resources: add cgroup-mode to node properties

so the frontend has the information readily available.

Suggested-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>

diff --git a/PVE/API2/Cluster.pm b/PVE/API2/Cluster.pm
index 49e319a5c624b356e7d8b8fb8692b9e6bed3f3e6..dc575d85b36f3d98ff98c40882f19826c5f51a43 100644 (file)
--- 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 eb0dc1305f9e126e0ee5a2da4b1914047dbb11c7..2515120c61481ccc4d47b5eaa3644dd17bff1fd3 100755 (executable)
--- 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));
     }
 }