From: Wolfgang Bumiller <w.bumiller@proxmox.com>
To: Alexandre Derumier <aderumier@odiso.com>
Cc: pve-devel@lists.proxmox.com
Subject: Re: [pve-devel] [PATCH pve-common 2/4] Cgroups: remove specific lxc code
Date: Thu, 5 Nov 2020 11:35:25 +0100 [thread overview]
Message-ID: <20201105103525.mdljzdwpdx6cszhd@olga.proxmox.com> (raw)
In-Reply-To: <20201030094217.53131-3-aderumier@odiso.com>
On Fri, Oct 30, 2020 at 10:42:15AM +0100, Alexandre Derumier wrote:
> ---
> src/PVE/CGroup.pm | 46 ++++------------------------------------------
> 1 file changed, 4 insertions(+), 42 deletions(-)
>
> diff --git a/src/PVE/CGroup.pm b/src/PVE/CGroup.pm
> index 7e12af9..f542b3a 100644
> --- a/src/PVE/CGroup.pm
> +++ b/src/PVE/CGroup.pm
> @@ -162,42 +161,6 @@ sub cpuset_controller_path() {
> return wantarray ? ($CG_PATH_CPUSET, $CG_VER_CPUSET) : $CG_PATH_CPUSET;
> }
>
> -# Get a subdirectory (without the cgroup mount point) for a controller.
> -#
> -# If `$controller` is `undef`, get the unified (cgroupv2) path.
> -#
> -# Note that in cgroup v2, lxc uses the activated controller names
> -# (`cgroup.controllers` file) as list of controllers for the unified hierarchy,
> -# so this returns a result when a `controller` is provided even when using
> -# a pure cgroupv2 setup.
> -my sub get_subdir {
Since this is now an abstract base class, instead of removing, please
add a dummy with our usual `die "implement in subclass";`, keeping the
parameter list visible:
sub get_subdir {
my ($self, $controller, $limiting) = @_;
die "imlement in subclass";
}
> - my ($self, $controller, $limiting) = @_;
> -
> - my $entry_name = $controller || 'unified';
> - my $entry = ($self->{controllers}->{$entry_name} //= {});
> -
> - my $kind = $limiting ? 'limit' : 'ns';
> - my $path = $entry->{$kind};
> -
> - return $path if defined $path;
> -
> - $path = PVE::LXC::Command::get_cgroup_path(
> - $self->{vmid},
> - $controller,
> - $limiting,
> - ) or return undef;
> -
> - # untaint:
> - if ($path =~ /\.\./) {
> - die "lxc returned suspicious path: '$path'\n";
> - }
> - ($path) = ($path =~ /^(.*)$/s);
> -
> - $entry->{$kind} = $path;
> -
> - return $path;
> -}
> -
> # Get path and version for a controller.
> #
> # `$controller` may be `undef`, see get_subdir above for details.
next prev parent reply other threads:[~2020-11-05 10:35 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-30 9:42 [pve-devel] [PATCH pve-common 0/4] add generic CGroup module Alexandre Derumier
2020-10-30 9:42 ` [pve-devel] [PATCH pve-common 1/4] move PVE::LXC::CGroup to PVE::CGroup Alexandre Derumier
2020-10-30 9:42 ` [pve-devel] [PATCH pve-common 2/4] Cgroups: remove specific lxc code Alexandre Derumier
2020-11-05 10:35 ` Wolfgang Bumiller [this message]
2020-10-30 9:42 ` [pve-devel] [PATCH pve-common 3/4] bugfix: cpushares : default value is 1024 for cgroup v1 Alexandre Derumier
2020-10-30 9:42 ` [pve-devel] [PATCH pve-common 4/4] systemd: add CPUWeight encoding Alexandre Derumier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201105103525.mdljzdwpdx6cszhd@olga.proxmox.com \
--to=w.bumiller@proxmox.com \
--cc=aderumier@odiso.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox