From ce251651a4ba94c4f233feead4039f1644966d5a Mon Sep 17 00:00:00 2001 From: Dominik Csapak Date: Thu, 3 Dec 2020 16:01:40 +0100 Subject: [PATCH] pvestatd: fix container cpuset scheduling Since pve-container commit c48a25452dccca37b3915e49b7618f6880aeafb1 the code to get the cpuset controller path lives in pve-commons PVE::CGroup. Use that and improve the logging in case some error happens in the future. Such an error will only be logged once per pvestatd run, so it does not spam the log. Signed-off-by: Dominik Csapak --- PVE/Service/pvestatd.pm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/PVE/Service/pvestatd.pm b/PVE/Service/pvestatd.pm index 5e533ca3..7193388c 100755 --- a/PVE/Service/pvestatd.pm +++ b/PVE/Service/pvestatd.pm @@ -20,7 +20,7 @@ use PVE::Storage; use PVE::QemuServer; use PVE::QemuServer::Monitor; use PVE::LXC; -use PVE::LXC::CGroup; +use PVE::CGroup; use PVE::LXC::Config; use PVE::RPCEnvironment; use PVE::API2::Subscription; @@ -257,7 +257,11 @@ my $NO_REBALANCE; sub rebalance_lxc_containers { # Make sure we can find the cpuset controller path: return if $NO_REBALANCE; - my $cpuset_base = eval { PVE::LXC::CGroup::cpuset_controller_path() }; + my $cpuset_base = eval { PVE::CGroup::cpuset_controller_path() }; + if (my $err = $@) { + syslog('info', "could not get cpuset controller path: $err"); + } + if (!defined($cpuset_base)) { $NO_REBALANCE = 1; return;