From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <f.ebner@proxmox.com>
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 DD6EF739D2
for <pve-devel@lists.proxmox.com>; Wed, 7 Jul 2021 10:53:17 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id C8A792CEA4
for <pve-devel@lists.proxmox.com>; Wed, 7 Jul 2021 10:52:47 +0200 (CEST)
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 id 4F1592CE9A
for <pve-devel@lists.proxmox.com>; Wed, 7 Jul 2021 10:52:47 +0200 (CEST)
Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1])
by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 19F2640EA3
for <pve-devel@lists.proxmox.com>; Wed, 7 Jul 2021 10:52:47 +0200 (CEST)
From: Fabian Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com
Date: Wed, 7 Jul 2021 10:52:43 +0200
Message-Id: <20210707085243.28469-1-f.ebner@proxmox.com>
X-Mailer: git-send-email 2.30.2
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.564 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 manager] 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 <pve-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
List-Post: <mailto:pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Wed, 07 Jul 2021 08:53:17 -0000
so the frontend has the information readily available.
Suggested-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
---
PVE/API2/Cluster.pm | 12 ++++++++++++
PVE/Service/pvestatd.pm | 11 +++++++++++
2 files changed, 23 insertions(+)
diff --git a/PVE/API2/Cluster.pm b/PVE/API2/Cluster.pm
index 3b918e55..11d6aa3a 100644
--- a/PVE/API2/Cluster.pm
+++ b/PVE/API2/Cluster.pm
@@ -306,6 +306,11 @@ __PACKAGE__->register_method({
type => 'string',
optional => 1,
},
+ 'cgroup-mode' => {
+ description => "The cgroup mode the node operates under (when type == node).",
+ type => 'integer',
+ optional => 1,
+ },
},
},
},
@@ -410,10 +415,17 @@ __PACKAGE__->register_method({
}
}
+ my $cgroup_modes = PVE::Cluster::get_node_kv("cgroup-mode");
+
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);
+
+ if (defined(my $mode = $cgroup_modes->{$node})) {
+ $entry->{'cgroup-mode'} = int($mode);
+ }
+
push @$res, $entry;
}
}
diff --git a/PVE/Service/pvestatd.pm b/PVE/Service/pvestatd.pm
index 7193388c..22173d63 100755
--- a/PVE/Service/pvestatd.pm
+++ b/PVE/Service/pvestatd.pm
@@ -122,6 +122,15 @@ my $generate_rrd_string = sub {
return join(':', map { $_ // 'U' } @$data);
};
+my $broadcast_cgroup_mode = sub {
+ my $cgroup_mode = eval { PVE::CGroup::cgroup_mode(); };
+ if (my $err = $@) {
+ syslog('err', "cgroup mode error: $err");
+ }
+
+ PVE::Cluster::broadcast_node_kv("cgroup-mode", $cgroup_mode);
+};
+
sub update_node_status {
my ($status_cfg) = @_;
@@ -151,6 +160,8 @@ sub update_node_status {
# everything not free is considered to be used
my $dused = $dinfo->{blocks} - $dinfo->{bfree};
+ $broadcast_cgroup_mode->();
+
my $ctime = time();
my $data = $generate_rrd_string->(
--
2.30.2