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 5922e01bd [cgroups2] Rename constants in cgroups2 isolator.
5922e01bd is described below
commit 5922e01bdf2157d42edb46adee20dcc2f0a02e15
Author: None <None>
AuthorDate: Thu May 16 15:49:46 2024 -0400
[cgroups2] Rename constants in cgroups2 isolator.
Specify that the cgroups2 constants are cgroups2 in their names.
This helps avoid redefinition of constants inside test files that
may import constant files from both cgroups v1 and v2.
Review: https://reviews.apache.org/r/74993/
---
.../mesos/isolators/cgroups2/constants.hpp | 18 +++++++++---------
.../mesos/isolators/cgroups2/controllers/core.cpp | 2 +-
.../mesos/isolators/cgroups2/controllers/cpu.cpp | 16 ++++++++--------
.../mesos/isolators/cgroups2/controllers/memory.cpp | 6 +++---
4 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/src/slave/containerizer/mesos/isolators/cgroups2/constants.hpp
b/src/slave/containerizer/mesos/isolators/cgroups2/constants.hpp
index b82f8cd74..1fb713837 100644
--- a/src/slave/containerizer/mesos/isolators/cgroups2/constants.hpp
+++ b/src/slave/containerizer/mesos/isolators/cgroups2/constants.hpp
@@ -26,18 +26,18 @@ namespace internal {
namespace slave {
// CPU controller constants.
-const uint64_t CPU_WEIGHT_PER_CPU = 100;
-const uint64_t CPU_WEIGHT_PER_CPU_REVOCABLE = 1;
-const uint64_t MIN_CPU_WEIGHT = 1; // Linux constant.
-const Duration CPU_CFS_PERIOD = Milliseconds(100); // Linux default.
-const Duration MIN_CPU_CFS_QUOTA = Milliseconds(1);
+const uint64_t CGROUPS2_CPU_WEIGHT_PER_CPU = 100;
+const uint64_t CGROUPS2_CPU_WEIGHT_PER_CPU_REVOCABLE = 1;
+const uint64_t CGROUPS2_MIN_CPU_WEIGHT = 1; // Linux constant.
+const Duration CGROUPS2_CPU_CFS_PERIOD = Milliseconds(100); // Linux default.
+const Duration CGROUPS2_MIN_CPU_CFS_QUOTA = Milliseconds(1);
// Memory controller constants.
-const Bytes MIN_MEMORY = Megabytes(32);
+const Bytes CGROUPS2_MIN_MEMORY = Megabytes(32);
-const std::string CGROUPS_V2_CONTROLLER_CORE_NAME = "core";
-const std::string CGROUPS_V2_CONTROLLER_CPU_NAME = "cpu";
-const std::string CGROUPS_V2_CONTROLLER_MEMORY_NAME = "memory";
+const std::string CGROUPS2_CONTROLLER_CORE_NAME = "core";
+const std::string CGROUPS2_CONTROLLER_CPU_NAME = "cpu";
+const std::string CGROUPS2_CONTROLLER_MEMORY_NAME = "memory";
} // namespace slave {
} // namespace internal {
diff --git
a/src/slave/containerizer/mesos/isolators/cgroups2/controllers/core.cpp
b/src/slave/containerizer/mesos/isolators/cgroups2/controllers/core.cpp
index 54f60c835..54d7c8977 100644
--- a/src/slave/containerizer/mesos/isolators/cgroups2/controllers/core.cpp
+++ b/src/slave/containerizer/mesos/isolators/cgroups2/controllers/core.cpp
@@ -49,7 +49,7 @@ CoreControllerProcess::CoreControllerProcess(const Flags&
_flags)
string CoreControllerProcess::name() const
{
- return CGROUPS_V2_CONTROLLER_CORE_NAME;
+ return CGROUPS2_CONTROLLER_CORE_NAME;
}
diff --git
a/src/slave/containerizer/mesos/isolators/cgroups2/controllers/cpu.cpp
b/src/slave/containerizer/mesos/isolators/cgroups2/controllers/cpu.cpp
index adebab744..0fcb9f2bc 100644
--- a/src/slave/containerizer/mesos/isolators/cgroups2/controllers/cpu.cpp
+++ b/src/slave/containerizer/mesos/isolators/cgroups2/controllers/cpu.cpp
@@ -57,7 +57,7 @@ CpuControllerProcess::CpuControllerProcess(const Flags&
_flags)
string CpuControllerProcess::name() const
{
- return CGROUPS_V2_CONTROLLER_CPU_NAME;
+ return CGROUPS2_CONTROLLER_CPU_NAME;
}
@@ -79,9 +79,9 @@ Future<Nothing> CpuControllerProcess::update(
double cpuRequest = *resourceRequests.cpus();
bool revocable = resourceRequests.revocable().cpus().isSome();
uint64_t weightPerCpu = (revocable && flags.revocable_cpu_low_priority) ?
- CPU_WEIGHT_PER_CPU_REVOCABLE : CPU_WEIGHT_PER_CPU;
+ CGROUPS2_CPU_WEIGHT_PER_CPU_REVOCABLE : CGROUPS2_CPU_WEIGHT_PER_CPU;
uint64_t weight = std::max(
- static_cast<uint64_t>(weightPerCpu * cpuRequest), MIN_CPU_WEIGHT);
+ static_cast<uint64_t>(weightPerCpu * cpuRequest),
CGROUPS2_MIN_CPU_WEIGHT);
Try<Nothing> update = cgroups2::cpu::weight(cgroup, weight);
if (update.isError()) {
@@ -98,23 +98,23 @@ Future<Nothing> CpuControllerProcess::update(
cpuLimit = resourceLimits.at("cpus").value();
}
BandwidthLimit limit = [&] () {
- uint64_t min_quota = static_cast<uint64_t>(MIN_CPU_CFS_QUOTA.us());
+ uint64_t min_quota =
static_cast<uint64_t>(CGROUPS2_MIN_CPU_CFS_QUOTA.us());
if (cpuLimit.isSome()) {
if (std::isinf(*cpuLimit)) {
return BandwidthLimit(); // (1)
}
- uint64_t quota = static_cast<uint64_t>(*cpuLimit * CPU_CFS_PERIOD.us());
+ uint64_t quota = static_cast<uint64_t>(*cpuLimit *
CGROUPS2_CPU_CFS_PERIOD.us());
return BandwidthLimit(
Microseconds(std::max(quota, min_quota)),
- CPU_CFS_PERIOD); // (1)
+ CGROUPS2_CPU_CFS_PERIOD); // (1)
}
if (flags.cgroups_enable_cfs) {
- uint64_t quota = static_cast<uint64_t>(cpuRequest * CPU_CFS_PERIOD.us());
+ uint64_t quota = static_cast<uint64_t>(cpuRequest *
CGROUPS2_CPU_CFS_PERIOD.us());
return BandwidthLimit(
Microseconds(std::max(quota, min_quota)),
- CPU_CFS_PERIOD); // (2)
+ CGROUPS2_CPU_CFS_PERIOD); // (2)
}
return BandwidthLimit(); // (3)
diff --git
a/src/slave/containerizer/mesos/isolators/cgroups2/controllers/memory.cpp
b/src/slave/containerizer/mesos/isolators/cgroups2/controllers/memory.cpp
index 4da2ab79e..361fbb6b9 100644
--- a/src/slave/containerizer/mesos/isolators/cgroups2/controllers/memory.cpp
+++ b/src/slave/containerizer/mesos/isolators/cgroups2/controllers/memory.cpp
@@ -59,7 +59,7 @@ MemoryControllerProcess::MemoryControllerProcess(const Flags&
_flags)
string MemoryControllerProcess::name() const
{
- return CGROUPS_V2_CONTROLLER_MEMORY_NAME;
+ return CGROUPS2_CONTROLLER_MEMORY_NAME;
}
@@ -140,7 +140,7 @@ Future<Nothing> MemoryControllerProcess::update(
}
Bytes memory = *resourceRequests.mem();
- Bytes softLimit = std::max(memory, MIN_MEMORY);
+ Bytes softLimit = std::max(memory, CGROUPS2_MIN_MEMORY);
// Set the soft memory limit.
Try<Nothing> low = cgroups2::memory::set_low(cgroup, softLimit);
@@ -161,7 +161,7 @@ Future<Nothing> MemoryControllerProcess::update(
}
return std::max(
- Megabytes(static_cast<uint64_t>(requestedLimit)), MIN_MEMORY);
+ Megabytes(static_cast<uint64_t>(requestedLimit)),
CGROUPS2_MIN_MEMORY);
}
return softLimit;
