pr-525 - [cgroups2] Introduces cgroups2::exists to check if a cgroup …

…exists.
m3scluster · Mar 26, 2024 · d6dbccf · d6dbccf
2 parents 2d283e0 + c52815e
commit d6dbccf
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/src/linux/cgroups2.cpp b/src/linux/cgroups2.cpp
@@ -243,6 +243,11 @@ Try<Nothing> unmount()
 }
 
 
+bool exists(const string& cgroup)
+{
+  return os::exists(path::join(MOUNT_POINT, cgroup));
+}
+
 Try<Nothing> create(const string& cgroup, bool recursive)
 {
   const string absolutePath = path::join(MOUNT_POINT, cgroup);
@@ -259,12 +264,11 @@ Try<Nothing> create(const string& cgroup, bool recursive)
 
 Try<Nothing> destroy(const string& cgroup)
 {
-  const string absolutePath = path::join(MOUNT_POINT, cgroup);
-
-  if (!os::exists(absolutePath)) {
-    return Error("There does not exist a cgroup at '" + absolutePath + "'");
+  if (!cgroups2::exists(cgroup)) {
+    return Error("Cgroup '" + cgroup + "' does not exist");
   }
 
+  const string absolutePath = path::join(MOUNT_POINT, cgroup);
   Try<Nothing> rmdir = os::rmdir(absolutePath, false);
   if (rmdir.isError()) {
     return Error("Failed to remove directory '" + absolutePath + "': "

diff --git a/src/linux/cgroups2.hpp b/src/linux/cgroups2.hpp
@@ -50,6 +50,9 @@ Try<bool> mounted();
 Try<Nothing> unmount();
 
 
+// Check if a cgroup exists.
+bool exists(const std::string& cgroup);
+
 // Creates a cgroup off of the base hierarchy, i.e. /sys/fs/cgroup/<cgroup>.
 // cgroup can be a nested cgroup (e.g. foo/bar/baz). If cgroup is a nested
 // cgroup and the parent cgroups do not exist, an error will be returned unless