neil/lxc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

reapplying patch to fix cgroups cpuset initialization (rhbz#1816949)

Browse Source
This commit is contained in:
Timotheus Pokorra 2020-05-30 08:11:47 +02:00
parent 550212a7bd
commit 8ef31f0e2a
2 changed files with 39 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
lxc-3.2.1-cgroups-fix-cpuset-init.patch Normal file
View File

@ -0,0 +1,34 @@
From b31d62b847a3ee013613795094cce4acc12345ef Mon Sep 17 00:00:00 2001
From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Sun, 28 Jul 2019 23:13:26 +0200
Subject: [PATCH] cgroups: initialize cpuset properly
Closes #3108.
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
---
src/lxc/cgroups/cgfsng.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/lxc/cgroups/cgfsng.c b/src/lxc/cgroups/cgfsng.c
index 7b8fe6736f..c29c0958e9 100644
--- a/src/lxc/cgroups/cgfsng.c
+++ b/src/lxc/cgroups/cgfsng.c
@@ -496,12 +496,12 @@ static bool cg_legacy_filter_and_set_cpus(char *path, bool am_initialized)
}
if (!flipped_bit) {
- DEBUG("No isolated or offline cpus present in cpuset");
- return true;
+ cpulist = lxc_cpumask_to_cpulist(possmask, maxposs);
+ TRACE("No isolated or offline cpus present in cpuset");
+ } else {
+ cpulist = move_ptr(posscpus);
+ TRACE("Removed isolated or offline cpus from cpuset");
}
- DEBUG("Removed isolated or offline cpus from cpuset");
-
- cpulist = lxc_cpumask_to_cpulist(possmask, maxposs);
if (!cpulist) {
ERROR("Failed to create cpu list");
return false;

6
lxc.spec
View File

@ -11,13 +11,14 @@
Name: lxc Name: lxc
Version: 3.2.1 Version: 3.2.1
Release: 2%{?dist} Release: 3%{?dist}
Summary: Linux Resource Containers Summary: Linux Resource Containers
License: LGPLv2+ and GPLv2 License: LGPLv2+ and GPLv2
URL: http://linuxcontainers.org/lxc URL: http://linuxcontainers.org/lxc
Source0: http://linuxcontainers.org/downloads/%{name}-%{version}.tar.gz Source0: http://linuxcontainers.org/downloads/%{name}-%{version}.tar.gz
Patch0: lxc-2.0.7-fix-init.patch Patch0: lxc-2.0.7-fix-init.patch
Patch1: lxc-2.0.6-fix-lxc-net.patch Patch1: lxc-2.0.6-fix-lxc-net.patch
Patch2: lxc-3.2.1-cgroups-fix-cpuset-init.patch
BuildRequires: docbook2X BuildRequires: docbook2X
BuildRequires: doxygen BuildRequires: doxygen
BuildRequires: kernel-headers BuildRequires: kernel-headers
@ -251,6 +252,9 @@ make check
%changelog %changelog
* Sat May 30 2020 Timotheus Pokorra <timotheus.pokorra@solidcharity.com> - 3.2.1-3
- reapplying patch to fix cgroups cpuset initialization (rhbz#1816949)
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.1-2 * Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild