This is an automated email from the ASF dual-hosted git repository.
bmahler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mesos.git
The following commit(s) were added to refs/heads/master by this push:
new bbb27f9c8 [cgroups2] Remove ENABLE_CGROUPS_V2 ifdefs.
bbb27f9c8 is described below
commit bbb27f9c8cde5df92ef11f157dd16e8fb54b7ce0
Author: Jason Zhou <[email protected]>
AuthorDate: Wed May 29 20:05:33 2024 -0400
[cgroups2] Remove ENABLE_CGROUPS_V2 ifdefs.
This commit removes the sections where ENABLE_CGROUPS_V2 is used
to determine the compiled code. Any need to determine whether or not
cgroups2 is used will be satisfied using the cgroups2::mounted() function.
This guard was only in place temporarily to avoid breaking our CI
while we figured out how to ensure that all of the CI docker images
have the header.
Review: https://reviews.apache.org/r/75021/
---
cmake/CompilationConfigure.cmake | 3 --
configure.ac | 42 +++++-----------------
src/CMakeLists.txt | 25 +++++--------
src/Makefile.am | 27 +++++---------
src/slave/containerizer/mesos/containerizer.cpp | 4 ---
src/slave/containerizer/mesos/linux_launcher.cpp | 14 --------
src/slave/flags.cpp | 4 ---
src/slave/main.cpp | 6 ----
src/tests/CMakeLists.txt | 8 ++---
src/tests/containerizer/cgroups_isolator_tests.cpp | 25 ++++++-------
src/tests/containerizer/memory_isolator_tests.cpp | 22 ++++++------
src/tests/environment.cpp | 2 +-
src/tests/mesos.cpp | 14 --------
13 files changed, 53 insertions(+), 143 deletions(-)
diff --git a/cmake/CompilationConfigure.cmake b/cmake/CompilationConfigure.cmake
index 88f3353bb..813b255d2 100644
--- a/cmake/CompilationConfigure.cmake
+++ b/cmake/CompilationConfigure.cmake
@@ -505,9 +505,6 @@ if (LINUX)
"The XFS disk isolator is not yet supported, see MESOS-9117.")
endif ()
- option(ENABLE_CGROUPS_V2
- "Whether to enable cgroups v2."
- FALSE)
option(ENABLE_LAUNCHER_SEALING
"Whether to enable containerizer launcher sealing via memfd."
diff --git a/configure.ac b/configure.ac
index e0314fb42..7c0597f56 100644
--- a/configure.ac
+++ b/configure.ac
@@ -396,13 +396,6 @@ AC_ARG_ENABLE([xfs-disk-isolator],
[builds the XFS disk isolator]),
[], [enable_xfs_disk_isolator=no])
-# TODO(dleamy): This flag should flipped to --disable-cgroups-v2 so using
-# cgroups v2 is the default.
-AC_ARG_ENABLE([cgroups-v2],
- AS_HELP_STRING([--enable-cgroups-v2],
- [builds the cgroups2 and ebpf modules]),
- [], [enable_cgroups_v2=no])
-
###############################################################################
# Optional packages.
###############################################################################
@@ -2294,36 +2287,17 @@ Please install the libblkid package for XFS disk
isolator support.
AM_CONDITIONAL([ENABLE_XFS_DISK_ISOLATOR], [test "x$enable_xfs_disk_isolator"
= "xyes"])
-
-AC_MSG_CHECKING([whether to enable the cgroups v2])
-AS_IF([test "x$enable_cgroups_v2" = "xyes"],
- [AC_MSG_RESULT([yes])],
- [AC_MSG_RESULT([no])])
-
-AS_IF([test "x$enable_cgroups_v2" = "xyes"], [
- # We only support cgroups v2 on Linux.
- AS_IF([test "$OS_NAME" = "linux"],
- [],
- [AC_MSG_ERROR([no cgroups v2 support on $OS_NAME
--------------------------------------------------------------------
-cgroups v2 is only supported on Linux.
--------------------------------------------------------------------
- ])])
-
- # Check for build dependencies for cgroups v2. We only
- # enable this if all the needed headers and libraries are present.
- AC_CHECK_HEADERS([linux/bpf.h],
- [], [AC_MSG_ERROR([missing eBPF headers
+# We only support cgroups v2 on Linux.
+AS_IF([test "$OS_NAME" = "linux"],
+ [
+# Check for build dependencies for cgroups v2. We only
+# enable this if all the needed headers and libraries are present.
+AC_CHECK_HEADERS([linux/bpf.h],
+ [], [AC_MSG_ERROR([missing eBPF headers
-------------------------------------------------------------------
Please install the bpf Linux kernel headers for cgroups v2 support.
-------------------------------------------------------------------
- ])])
-
- AC_DEFINE([ENABLE_CGROUPS_V2])
-])
-
-AM_CONDITIONAL([ENABLE_CGROUPS_V2], [test "x$enable_cgroups_v2" = "xyes"])
-
+])])])
# Check if zlib prefix path was provided, and if so, add it to
# the CPPFLAGS and LDFLAGS with respective /include and /lib path
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3973737f1..ea0fee1bb 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -341,7 +341,15 @@ set(LINUX_SRC
slave/containerizer/mesos/isolators/volume/csi/isolator.cpp
slave/containerizer/mesos/provisioner/backends/aufs.cpp
slave/containerizer/mesos/provisioner/backends/bind.cpp
- slave/containerizer/mesos/provisioner/backends/overlay.cpp)
+ slave/containerizer/mesos/provisioner/backends/overlay.cpp
+ linux/cgroups2.cpp
+ linux/ebpf.cpp
+ slave/containerizer/mesos/isolators/cgroups2/cgroups2.cpp
+ slave/containerizer/mesos/isolators/cgroups2/controller.cpp
+ slave/containerizer/mesos/isolators/cgroups2/controllers/core.cpp
+ slave/containerizer/mesos/isolators/cgroups2/controllers/cpu.cpp
+ slave/containerizer/mesos/isolators/cgroups2/controllers/memory.cpp
+ slave/containerizer/mesos/isolators/cgroups2/controllers/perf_event.cpp)
if (ENABLE_XFS_DISK_ISOLATOR)
list(APPEND LINUX_SRC
@@ -349,20 +357,6 @@ if (ENABLE_XFS_DISK_ISOLATOR)
slave/containerizer/mesos/isolators/xfs/utils.cpp)
endif ()
-if (ENABLE_CGROUPS_V2)
- list(APPEND LINUX_SRC
- linux/cgroups2.cpp
- linux/ebpf.cpp
- slave/containerizer/mesos/isolators/cgroups2/cgroups2.cpp
- slave/containerizer/mesos/isolators/cgroups2/controller.cpp
- slave/containerizer/mesos/isolators/cgroups2/controllers/core.cpp
- slave/containerizer/mesos/isolators/cgroups2/controllers/cpu.cpp
- slave/containerizer/mesos/isolators/cgroups2/controllers/memory.cpp
- slave/containerizer/mesos/isolators/cgroups2/controllers/perf_event.cpp)
-
-
-endif ()
-
if (ENABLE_LAUNCHER_SEALING)
list(APPEND LINUX_SRC
linux/memfd.cpp)
@@ -625,7 +619,6 @@ target_compile_definitions(
mesos PUBLIC
USE_CMAKE_BUILD_CONFIG
$<$<BOOL:${ENABLE_XFS_DISK_ISOLATOR}>:ENABLE_XFS_DISK_ISOLATOR>
- $<$<BOOL:${ENABLE_CGROUPS_V2}>:ENABLE_CGROUPS_V2>
$<$<BOOL:${ENABLE_LAUNCHER_SEALING}>:ENABLE_LAUNCHER_SEALING>
$<$<BOOL:${ENABLE_NVML}>:ENABLE_NVML>
$<$<BOOL:${ENABLE_PORT_MAPPING_ISOLATOR}>:ENABLE_PORT_MAPPING_ISOLATOR>
diff --git a/src/Makefile.am b/src/Makefile.am
index 68a93674f..b6acfb5ea 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1479,18 +1479,7 @@ MESOS_LINUX_FILES =
\
slave/containerizer/mesos/provisioner/backends/bind.cpp
\
slave/containerizer/mesos/provisioner/backends/bind.hpp
\
slave/containerizer/mesos/provisioner/backends/overlay.cpp
\
- slave/containerizer/mesos/provisioner/backends/overlay.hpp
-
-if ENABLE_XFS_DISK_ISOLATOR
-MESOS_LINUX_FILES += \
- slave/containerizer/mesos/isolators/xfs/utils.cpp \
- slave/containerizer/mesos/isolators/xfs/utils.hpp \
- slave/containerizer/mesos/isolators/xfs/disk.cpp \
- slave/containerizer/mesos/isolators/xfs/disk.hpp
-endif
-
-if ENABLE_CGROUPS_V2
-MESOS_LINUX_FILES += \
+ slave/containerizer/mesos/provisioner/backends/overlay.hpp \
linux/cgroups2.cpp \
linux/cgroups2.hpp \
linux/ebpf.cpp \
@@ -1509,6 +1498,12 @@ MESOS_LINUX_FILES +=
\
slave/containerizer/mesos/isolators/cgroups2/controllers/perf_event.cpp \
slave/containerizer/mesos/isolators/cgroups2/controllers/perf_event.hpp
+if ENABLE_XFS_DISK_ISOLATOR
+MESOS_LINUX_FILES += \
+ slave/containerizer/mesos/isolators/xfs/utils.cpp \
+ slave/containerizer/mesos/isolators/xfs/utils.hpp \
+ slave/containerizer/mesos/isolators/xfs/disk.cpp \
+ slave/containerizer/mesos/isolators/xfs/disk.hpp
endif
if ENABLE_SECCOMP_ISOLATOR
@@ -2831,18 +2826,14 @@ mesos_tests_SOURCES =
\
tests/containerizer/provisioner_paths_tests.cpp \
tests/containerizer/rootfs.hpp \
tests/containerizer/setns_test_helper.hpp \
- tests/containerizer/volume_sandbox_path_isolator_tests.cpp
+ tests/containerizer/volume_sandbox_path_isolator_tests.cpp \
+ tests/containerizer/cgroups2_tests.cpp
if ENABLE_XFS_DISK_ISOLATOR
mesos_tests_SOURCES += \
tests/containerizer/xfs_quota_tests.cpp
endif
-if ENABLE_CGROUPS_V2
-mesos_tests_SOURCES += \
- tests/containerizer/cgroups2_tests.cpp
-endif
-
if ENABLE_SECCOMP_ISOLATOR
mesos_tests_SOURCES += \
tests/containerizer/linux_seccomp_parser_tests.cpp \
diff --git a/src/slave/containerizer/mesos/containerizer.cpp
b/src/slave/containerizer/mesos/containerizer.cpp
index 2fc1ee56e..f7ff6b8e5 100644
--- a/src/slave/containerizer/mesos/containerizer.cpp
+++ b/src/slave/containerizer/mesos/containerizer.cpp
@@ -117,11 +117,9 @@
#include "slave/containerizer/mesos/isolators/volume/secret.hpp"
#include "slave/containerizer/mesos/isolators/volume/csi/isolator.hpp"
-#ifdef ENABLE_CGROUPS_V2
#include "linux/cgroups2.hpp"
#include "slave/containerizer/mesos/isolators/cgroups2/cgroups2.hpp"
-#endif // ENABLE_CGROUPS_V2
#endif // __linux__
@@ -374,7 +372,6 @@ Try<MesosContainerizer*> MesosContainerizer::create(
// Initialize either the cgroups v2 or cgroups v1 isolator, based on what
// is available on the host machine.
auto cgroupsIsolatorSelector = [] (const Flags& flags) -> Try<Isolator*> {
-#ifdef ENABLE_CGROUPS_V2
Try<bool> mounted = cgroups2::mounted();
if (mounted.isError()) {
return Error("Failed to determine if the cgroup2 filesystem is mounted: "
@@ -383,7 +380,6 @@ Try<MesosContainerizer*> MesosContainerizer::create(
if (*mounted) {
return Cgroups2IsolatorProcess::create(flags);
}
-#endif // ENABLE_CGROUPS_V2
return CgroupsIsolatorProcess::create(flags);
};
#endif // __linux__
diff --git a/src/slave/containerizer/mesos/linux_launcher.cpp
b/src/slave/containerizer/mesos/linux_launcher.cpp
index 7682a561a..f651afee0 100644
--- a/src/slave/containerizer/mesos/linux_launcher.cpp
+++ b/src/slave/containerizer/mesos/linux_launcher.cpp
@@ -32,9 +32,7 @@
#include <stout/stringify.hpp>
#include "linux/cgroups.hpp"
-#ifdef ENABLE_CGROUPS_V2
#include "linux/cgroups2.hpp"
-#endif // ENABLE_CGROUPS_V2
#include "linux/ns.hpp"
#include "linux/systemd.hpp"
@@ -137,7 +135,6 @@ private:
Try<Launcher*> LinuxLauncher::create(const Flags& flags)
{
-#ifdef ENABLE_CGROUPS_V2
Try<bool> mounted = cgroups2::mounted();
if (mounted.isError()) {
return Error("Failed to check if cgroups2 is mounted: " + mounted.error());
@@ -145,7 +142,6 @@ Try<Launcher*> LinuxLauncher::create(const Flags& flags)
if (*mounted) {
return createCgroups2Launcher(flags);
}
-#endif // ENABLE_CGROUPS_V2
return createCgroupsLauncher(flags);
}
@@ -224,11 +220,9 @@ bool LinuxLauncher::available()
{
bool available = false;
-#ifdef ENABLE_CGROUPS_V2
// Check if cgroups v2 is available.
Try<bool> mounted = cgroups2::mounted();
available |= mounted.isSome() && *mounted;
-#endif // ENABLE_CGROUPS_V2
// Check if cgroups v1 is available.
// Make sure:
@@ -522,7 +516,6 @@ Try<Nothing>
LinuxLauncherProcess::recoverContainersFromCgroups()
Try<Nothing> LinuxLauncherProcess::recoverContainersFromCgroups2()
{
-#ifdef ENABLE_CGROUPS_V2
Try<set<string>> cgroups = cgroups2::get(flags.cgroups_root);
if (cgroups.isError()) {
return Error("Failed to get cgroups: " + cgroups.error());
@@ -546,9 +539,6 @@ Try<Nothing>
LinuxLauncherProcess::recoverContainersFromCgroups2()
LOG(INFO) << "Recovered container " << container.id;
}
return Nothing();
-#else
- return Error("cgroups2 is not enabled");
-#endif // ENABLE_CGROUPS_V2
}
@@ -776,7 +766,6 @@ Future<Nothing> LinuxLauncherProcess::_destroyCgroups(
Future<Nothing> LinuxLauncherProcess::destroyCgroups2(
const Container& container)
{
-#ifdef ENABLE_CGROUPS_V2
const string& cgroup =
containerizer::paths::cgroups2::container(flags.cgroups_root,
container.id);
@@ -785,9 +774,6 @@ Future<Nothing> LinuxLauncherProcess::destroyCgroups2(
LOG(INFO) << "Destroying cgroup '" << cgroup << "'";
return cgroups2::destroy(cgroup);
-#else
- return Failure("cgroups2 is not enabled");
-#endif // ENABLE_CGROUPS_V2
}
diff --git a/src/slave/flags.cpp b/src/slave/flags.cpp
index 151875661..7a1eaf7ab 100644
--- a/src/slave/flags.cpp
+++ b/src/slave/flags.cpp
@@ -38,9 +38,7 @@
#ifdef __linux__
#include "slave/containerizer/mesos/linux_launcher.hpp"
-#ifdef ENABLE_CGROUPS_V2
#include "linux/cgroups2.hpp"
-#endif // ENABLE_CGROUPS_V2
#endif // __linux__
@@ -660,7 +658,6 @@ mesos::internal::slave::Flags::Flags()
"swap instead of just memory. Not supported if cgroups v2 is used.\n",
false,
[](const bool& limit_swap) -> Option<Error> {
-#ifdef ENABLE_CGROUPS_V2
Try<bool> mounted = cgroups2::mounted();
if (mounted.isError()) {
return Error("Failed to check if cgroup2 filesystem is mounted: "
@@ -673,7 +670,6 @@ mesos::internal::slave::Flags::Flags()
return Error("The cgroups v2 isolator does not support limiting "
"swap memory but `--cgroups_limit_swap` was provided");
}
-#endif // ENABLE_CGROUPS_V2
return None();
});
diff --git a/src/slave/main.cpp b/src/slave/main.cpp
index 8a0e161ff..21b8ea74a 100644
--- a/src/slave/main.cpp
+++ b/src/slave/main.cpp
@@ -77,10 +77,8 @@
#include "linux/cgroups.hpp"
#include "linux/systemd.hpp"
-#ifdef ENABLE_CGROUPS_V2
#include "linux/cgroups2.hpp"
#include "slave/containerizer/mesos/isolators/cgroups2/cgroups2.hpp"
-#endif // ENABLE_CGROUPS_V2
#endif // __linux__
@@ -155,7 +153,6 @@ const char* malloc_conf = "narenas:4";
#ifdef __linux__
-#ifdef ENABLE_CGROUPS_V2
// Log any processes inside of a cgroup.
static Try<Nothing> logProcesses(const string& cgroup)
{
@@ -296,7 +293,6 @@ static Try<Nothing> initializeCgroups2(const slave::Flags&
flags)
return Nothing();
}
-#endif // ENABLE_CGROUPS_V2
// Move the slave into its own cgroup for each of the specified
@@ -562,7 +558,6 @@ int main(int argc, char** argv)
// Use the cgroups v2 isolator if it is supported. Otherwise, use
// the cgroups v1 isolator.
[&flags] () {
-#ifdef ENABLE_CGROUPS_V2
Try<bool> mounted = cgroups2::mounted();
if (mounted.isError()) {
EXIT(EXIT_FAILURE) << mounted.error();
@@ -577,7 +572,6 @@ int main(int argc, char** argv)
}
return;
}
-#endif // ENABLE_CGROUPS_V2
// Initialize a cgroups hierarchy for each of the controllers that
// are requested, create the root Mesos Agent's cgroup, and move the
diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index 79f42bd89..74c7c9ec3 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -250,18 +250,14 @@ if (LINUX)
containerizer/volume_csi_isolator_tests.cpp
containerizer/volume_host_path_isolator_tests.cpp
containerizer/volume_image_isolator_tests.cpp
- containerizer/volume_secret_isolator_tests.cpp)
+ containerizer/volume_secret_isolator_tests.cpp
+ containerizer/cgroups2_tests.cpp)
if (ENABLE_XFS_DISK_ISOLATOR)
list(APPEND MESOS_TESTS_SRC
containerizer/xfs_quota_tests.cpp)
endif()
- if (ENABLE_CGROUPS_V2)
- list(APPEND MESOS_TESTS_SRC
- containerizer/cgroups2_tests.cpp)
- endif()
-
if (ENABLE_SECCOMP_ISOLATOR)
list(APPEND MESOS_TESTS_SRC
containerizer/linux_seccomp_parser_tests.cpp
diff --git a/src/tests/containerizer/cgroups_isolator_tests.cpp
b/src/tests/containerizer/cgroups_isolator_tests.cpp
index 6a0443404..2f5f93bfa 100644
--- a/src/tests/containerizer/cgroups_isolator_tests.cpp
+++ b/src/tests/containerizer/cgroups_isolator_tests.cpp
@@ -378,18 +378,19 @@ TEST_F(CgroupsIsolatorTest, ROOT_CGROUPS_RevocableCpu)
string cpuCgroup = path::join(flags.cgroups_root, containerId.value());
double totalCpus = cpus.cpus().get() + DEFAULT_EXECUTOR_CPUS;
-#ifdef ENABLE_CGROUPS_V2
- EXPECT_SOME_EQ(
- static_cast<uint64_t>(CGROUPS2_CPU_WEIGHT_PER_CPU_REVOCABLE * totalCpus),
- cgroups2::cpu::weight(cpuCgroup));
-#else
- Result<string> cpuHierarchy = cgroups::hierarchy("cpu");
- ASSERT_SOME(cpuHierarchy);
-
- EXPECT_SOME_EQ(
- CPU_SHARES_PER_CPU_REVOCABLE * totalCpus,
- cgroups::cpu::shares(cpuHierarchy.get(), cpuCgroup));
-#endif // ENABLE_CGROUPS_V2
+ if (cgroupsV2()) {
+ EXPECT_SOME_EQ(
+ static_cast<uint64_t>(
+ CGROUPS2_CPU_WEIGHT_PER_CPU_REVOCABLE * totalCpus),
+ cgroups2::cpu::weight(cpuCgroup));
+ } else {
+ Result<string> cpuHierarchy = cgroups::hierarchy("cpu");
+ ASSERT_SOME(cpuHierarchy);
+
+ EXPECT_SOME_EQ(
+ CPU_SHARES_PER_CPU_REVOCABLE * totalCpus,
+ cgroups::cpu::shares(cpuHierarchy.get(), cpuCgroup));
+ }
driver.stop();
driver.join();
diff --git a/src/tests/containerizer/memory_isolator_tests.cpp
b/src/tests/containerizer/memory_isolator_tests.cpp
index be8475f51..8add89337 100644
--- a/src/tests/containerizer/memory_isolator_tests.cpp
+++ b/src/tests/containerizer/memory_isolator_tests.cpp
@@ -154,20 +154,20 @@ TEST_P(MemoryIsolatorTest, ROOT_MemUsage)
if (GetParam() == "cgroups/mem") {
// Check that at least one page of kernel memory is used. Each page is
// 4096 bytes so we expect at least that much memory to be used.
-#ifdef ENABLE_CGROUPS_V2
- ASSERT_LT(4096u, usage->mem_kmem_usage_bytes());
-#else
- Result<std::string> hierarchy = cgroups::hierarchy("memory");
- ASSERT_SOME(hierarchy);
+ if (cgroupsV2()) {
+ ASSERT_LT(4096u, usage->mem_kmem_usage_bytes());
+ } else {
+ Result<std::string> hierarchy = cgroups::hierarchy("memory");
+ ASSERT_SOME(hierarchy);
- Try<bool> kmemExists = cgroups::exists(
- hierarchy.get(), "memory.kmem.usage_in_bytes");
- ASSERT_SOME(kmemExists);
+ Try<bool> kmemExists =
+ cgroups::exists(hierarchy.get(), "memory.kmem.usage_in_bytes");
+ ASSERT_SOME(kmemExists);
- if (kmemExists.get()) {
- ASSERT_LT(4096u, usage->mem_kmem_usage_bytes());
+ if (kmemExists.get()) {
+ ASSERT_LT(4096u, usage->mem_kmem_usage_bytes());
+ }
}
-#endif // ENABLE_CGROUPS_V2
}
driver.stop();
diff --git a/src/tests/environment.cpp b/src/tests/environment.cpp
index 7a55774d8..6e1af5e74 100644
--- a/src/tests/environment.cpp
+++ b/src/tests/environment.cpp
@@ -232,7 +232,7 @@ public:
{
if (matches(test, "CGROUPS2_") || matches(test, "Cgroups2")) {
-#if defined(__linux__) && defined(ENABLE_CGROUPS_V2)
+#ifdef __linux__
Result<string> user = os::user();
CHECK_SOME(user);
return *user != "root" || !cgroups2::enabled();
diff --git a/src/tests/mesos.cpp b/src/tests/mesos.cpp
index d33c7b477..53f35be16 100644
--- a/src/tests/mesos.cpp
+++ b/src/tests/mesos.cpp
@@ -37,9 +37,7 @@
#include "linux/cgroups.hpp"
#include "linux/fs.hpp"
-#ifdef ENABLE_CGROUPS_V2
#include "linux/cgroups2.hpp"
-#endif // ENABLE_CGROUPS_V2
#endif
@@ -636,12 +634,10 @@ void
ContainerizerTest<slave::MesosContainerizer>::SetUpTestCase()
EXPECT_SOME(user);
if (cgroupsV2() && *user == "root") {
-#ifdef ENABLE_CGROUPS_V2
// Clean up test cgroups.
if (cgroups2::exists(TEST_CGROUPS_ROOT)) {
AWAIT_ASSERT_READY(cgroups2::destroy(TEST_CGROUPS_ROOT));
}
-#endif // ENABLE_CGROUPS_V2
} else if (cgroups::enabled() && *user == "root") {
// Clean up any testing hierarchies.
Try<set<string>> hierarchies = cgroups::hierarchies();
@@ -663,12 +659,10 @@ void
ContainerizerTest<slave::MesosContainerizer>::TearDownTestCase()
EXPECT_SOME(user);
if (cgroupsV2() && *user == "root") {
-#ifdef ENABLE_CGROUPS_V2
// Clean up test cgroups.
if (cgroups2::exists(TEST_CGROUPS_ROOT)) {
AWAIT_ASSERT_READY(cgroups2::destroy(TEST_CGROUPS_ROOT));
}
-#endif // ENABLE_CGROUPS_V2
} else if (cgroups::enabled() && *user == "root") {
// Clean up any testing hierarchies.
Try<set<string>> hierarchies = cgroups::hierarchies();
@@ -794,7 +788,6 @@ void
ContainerizerTest<slave::MesosContainerizer>::SetUpCgroups()
void ContainerizerTest<slave::MesosContainerizer>::SetUpCgroupsV2()
{
-#ifdef ENABLE_CGROUPS_V2
// When the agent binary is run, cgroups are initialized inside
// `slave/main.cpp`. This cgroups setup is done to in place of that
// initialization.
@@ -816,7 +809,6 @@ void
ContainerizerTest<slave::MesosContainerizer>::SetUpCgroupsV2()
ASSERT_SOME(
cgroups2::controllers::enable(cgroups2::ROOT_CGROUP, controllers));
ASSERT_SOME(cgroups2::controllers::enable(TEST_CGROUPS_ROOT, controllers));
-#endif // ENABLE_CGROUPS_V2
}
@@ -856,25 +848,19 @@ void
ContainerizerTest<slave::MesosContainerizer>::TearDownCgroups()
void ContainerizerTest<slave::MesosContainerizer>::TearDownCgroupsV2()
{
-#ifdef ENABLE_CGROUPS_V2
// Destroy all cgroups that were created under the test root cgroup.
AWAIT_ASSERT_READY(cgroups2::destroy(TEST_CGROUPS_ROOT));
-#endif // ENABLE_CGROUPS_V2
}
#endif // __linux__
bool ContainerizerTest<slave::MesosContainerizer>::cgroupsV2()
{
-#ifdef ENABLE_CGROUPS_V2
Try<bool> mounted = cgroups2::mounted();
if (mounted.isError()) {
return false;
}
return *mounted;
-#else
- return false;
-#endif // ENABLE_CGROUPS_V2
}
