[pve-devel] [PATCH manager] pvestatd: fix container cpuset scheduling

[pve-devel] [PATCH manager] pvestatd: fix container cpuset scheduling

[Dominik Csapak]

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 <d.csapak@proxmox.com>
---
 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;
-- 
2.20.1

Re: [pve-devel] [PATCH manager] pvestatd: fix container cpuset scheduling

[Aaron Lauterer]

Tested-By: Aaron Lauterer <a.lauterer@proxmox.com>

On 12/3/20 4:01 PM, Dominik Csapak wrote:
> 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 <d.csapak@proxmox.com>
> ---
>   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;
> 

Re: [pve-devel] [PATCH manager] pvestatd: fix container cpuset scheduling

[Thomas Lamprecht]

On 03.12.20 16:35, Aaron Lauterer wrote:
> Tested-By: Aaron Lauterer <a.lauterer@proxmox.com>

saw this to late for adding it into the commit message, still thanks for
the feedback though!

[pve-devel] applied: [PATCH manager] pvestatd: fix container cpuset scheduling

[Thomas Lamprecht]

On 03.12.20 16:01, Dominik Csapak wrote:
> 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.

That was worded confusingly for me, I thought you mean "once per pvestatd update
loop run", but it is actually only the first loop (which I like more ^^)

> 
> Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
> ---
>  PVE/Service/pvestatd.pm | 8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)
> 
>

applied, thanks!