set the cpuset.cpus/mems of machine.slice to all by default
This commit is contained in:
parent
d0cadc81ef
commit
8fca0ab1e6
46
set-the-cpuset.cpus-mems-of-machine.slice-to-all-by-.patch
Normal file
46
set-the-cpuset.cpus-mems-of-machine.slice-to-all-by-.patch
Normal file
@ -0,0 +1,46 @@
|
|||||||
|
From 14b69596b0bff64f7482d93ea3f043520a716921 Mon Sep 17 00:00:00 2001
|
||||||
|
From: rpm-build <rpm-build>
|
||||||
|
Date: Thu, 8 Jun 2023 20:02:50 +0800
|
||||||
|
Subject: [PATCH] set the cpuset.cpus/mems of machine.slice to all by default
|
||||||
|
This is necessary after merging core-cgroup-support-cpuset.patch.
|
||||||
|
|
||||||
|
When creating a vm, libvirt will issue a dbus method_call to
|
||||||
|
systemd-machined. systemd-machined will start transient unit
|
||||||
|
usually named xxx.scope with Delegate=1 set after receiving
|
||||||
|
the method_call. If Delegate=1 is set, systemd will create
|
||||||
|
machine.slice in /sys/fs/cgroup for every cgroup subsystem, this
|
||||||
|
includes cpuset. cpuset is different, you can't migrate processes
|
||||||
|
to the created directory unless you have set proper cpuset.cpus
|
||||||
|
and cpuset.mems.
|
||||||
|
|
||||||
|
Without this patch, libvirt sees machine.slice, it won't check
|
||||||
|
if cpuset.cpus or cpuset.mems is valid, and just migrate the vm
|
||||||
|
process to machine.slice. This action will fail because core-cgroup
|
||||||
|
-support-cpuset.patch only supports create the machine.slice
|
||||||
|
directory when Delegate=1 is set, but won't set cpuset.cpus
|
||||||
|
and cpuset.mems automatically.
|
||||||
|
|
||||||
|
Now we have this patch, it will make systemd automatically set
|
||||||
|
cpuset.cpus and cpuset.mems according to /sys/fs/cgroup/cpuset/{
|
||||||
|
cpuset.cpus, cpuset.mems}. Then libvirt can migrate vm processes
|
||||||
|
freely.
|
||||||
|
---
|
||||||
|
units/machine.slice | 5 +++++
|
||||||
|
1 file changed, 5 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/units/machine.slice b/units/machine.slice
|
||||||
|
index 501d353..8d87851 100644
|
||||||
|
--- a/units/machine.slice
|
||||||
|
+++ b/units/machine.slice
|
||||||
|
@@ -11,3 +11,8 @@
|
||||||
|
Description=Virtual Machine and Container Slice
|
||||||
|
Documentation=man:systemd.special(7)
|
||||||
|
Before=slices.target
|
||||||
|
+
|
||||||
|
+[Slice]
|
||||||
|
+CPUSetCpus=all
|
||||||
|
+CPUSetMems=all
|
||||||
|
+CPUSetCloneChildren=1
|
||||||
|
--
|
||||||
|
2.33.0
|
||||||
|
|
||||||
@ -21,7 +21,7 @@
|
|||||||
Name: systemd
|
Name: systemd
|
||||||
Url: https://www.freedesktop.org/wiki/Software/systemd
|
Url: https://www.freedesktop.org/wiki/Software/systemd
|
||||||
Version: 249
|
Version: 249
|
||||||
Release: 49
|
Release: 50
|
||||||
License: MIT and LGPLv2+ and GPLv2+
|
License: MIT and LGPLv2+ and GPLv2+
|
||||||
Summary: System and Service Manager
|
Summary: System and Service Manager
|
||||||
|
|
||||||
@ -509,6 +509,7 @@ Patch9053: support-disable-cgroup-controllers-we-don-t-want.patch
|
|||||||
Patch9054: fix-mount-failed-while-daemon-reexec.patch
|
Patch9054: fix-mount-failed-while-daemon-reexec.patch
|
||||||
Patch9055: bugfix-for-cgroup-Swap-cgroup-v1-deletion-and-migration.patch
|
Patch9055: bugfix-for-cgroup-Swap-cgroup-v1-deletion-and-migration.patch
|
||||||
Patch9056: delete-journal-files-except-system.journal-when-jour.patch
|
Patch9056: delete-journal-files-except-system.journal-when-jour.patch
|
||||||
|
Patch9057: set-the-cpuset.cpus-mems-of-machine.slice-to-all-by-.patch
|
||||||
|
|
||||||
BuildRequires: gcc, gcc-c++
|
BuildRequires: gcc, gcc-c++
|
||||||
BuildRequires: libcap-devel, libmount-devel, pam-devel, libselinux-devel
|
BuildRequires: libcap-devel, libmount-devel, pam-devel, libselinux-devel
|
||||||
@ -1921,6 +1922,9 @@ fi
|
|||||||
%{_libdir}/security/pam_systemd.so
|
%{_libdir}/security/pam_systemd.so
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Jun 8 2023 licunlong <licunlong1@huawei.com> - 249-50
|
||||||
|
- set the cpuset.cpus/mems of machine.slice to all by default
|
||||||
|
|
||||||
* Wed Mar 22 2023 hongjinghao <hongjinghao@huawei.comg> - 249-49
|
* Wed Mar 22 2023 hongjinghao <hongjinghao@huawei.comg> - 249-49
|
||||||
- backport: sync patches from systemd community
|
- backport: sync patches from systemd community
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user