From 76a7da678f1cffe26eb7a74bf61f84dcbebbca74 Mon Sep 17 00:00:00 2001
From: Dom Del Nano <ddelnano@gmail.com>
Date: Tue, 13 Aug 2024 16:58:22 +0000
Subject: [PATCH 1/6] Update cgroup resolver to try all possible base paths.
 Update force_cgroup2_mode default to prevent test only behavior from normal
 operation

Signed-off-by: Dom Del Nano <ddelnano@gmail.com>
---
 src/shared/metadata/cgroup_path_resolver.cc   | 137 ++++++++++--------
 .../metadata/cgroup_path_resolver_test.cc     |   2 +-
 2 files changed, 81 insertions(+), 58 deletions(-)

diff --git a/src/shared/metadata/cgroup_path_resolver.cc b/src/shared/metadata/cgroup_path_resolver.cc
index 6086ef69417..7bac3d55ade 100644
--- a/src/shared/metadata/cgroup_path_resolver.cc
+++ b/src/shared/metadata/cgroup_path_resolver.cc
@@ -27,12 +27,13 @@
 #include "src/common/fs/fs_wrapper.h"
 #include "src/shared/metadata/cgroup_path_resolver.h"
 
-DEFINE_bool(force_cgroup2_mode, true, "Flag to force assume cgroup2 fs for testing purposes");
+DEFINE_bool(force_cgroup2_mode, false, "Flag to force assume cgroup2 fs for testing purposes");
 
 namespace px {
 namespace md {
 
-StatusOr<std::string> CGroupBasePath(std::string_view sysfs_path) {
+StatusOr<std::vector<std::string>> CGroupBasePaths(std::string_view sysfs_path) {
+  std::vector<std::string> base_paths;
   // Different hosts may mount different cgroup dirs. Try a couple for robustness.
   const std::vector<std::string> cgroup_dirs = {"cpu,cpuacct", "cpu", "pids"};
 
@@ -43,7 +44,7 @@ StatusOr<std::string> CGroupBasePath(std::string_view sysfs_path) {
     std::string base_path = absl::StrCat(sysfs_path, "/cgroup/", cgroup_dir);
 
     if (fs::Exists(base_path)) {
-      return base_path;
+      base_paths.push_back(base_path);
     }
   }
 
@@ -53,11 +54,17 @@ StatusOr<std::string> CGroupBasePath(std::string_view sysfs_path) {
   bool cgroupv2 = (fs_status == 0) && (info.f_type == CGROUP2_SUPER_MAGIC);
 
   if (cgroupv2 || FLAGS_force_cgroup2_mode) {
-    return cgv2_base_path;
+    if (FLAGS_force_cgroup2_mode) {
+      return std::vector{cgv2_base_path};
+    }
+    base_paths.push_back(cgv2_base_path);
   }
   // (TODO): This check for cgroup2FS is eventually to be moved above the cgroupv1 check.
 
-  return error::NotFound("Could not find CGroup base path");
+  if (base_paths.empty()) {
+    return error::NotFound("Could not find CGroup base path");
+  }
+  return base_paths;
 }
 
 StatusOr<std::string> FindSelfCGroupProcs(std::string_view base_path) {
@@ -137,17 +144,32 @@ StatusOr<CGroupTemplateSpec> CreateCGroupTemplateSpecFromPath(std::string_view p
 }
 
 StatusOr<CGroupTemplateSpec> AutoDiscoverCGroupTemplate(std::string_view sysfs_path) {
-  PX_ASSIGN_OR_RETURN(std::string base_path, CGroupBasePath(sysfs_path));
-  LOG(INFO) << "Auto-discovered CGroup base path: " << base_path;
-
-  PX_ASSIGN_OR_RETURN(std::string self_cgroup_procs, FindSelfCGroupProcs(base_path));
-  LOG(INFO) << "Auto-discovered example path: " << self_cgroup_procs;
-
-  PX_ASSIGN_OR_RETURN(CGroupTemplateSpec cgroup_path_template,
-                      CreateCGroupTemplateSpecFromPath(self_cgroup_procs));
-  LOG(INFO) << "Auto-discovered template: " << cgroup_path_template.templated_path;
+  PX_ASSIGN_OR_RETURN(std::vector<std::string> base_paths, CGroupBasePaths(sysfs_path));
+  for (const auto& base_path : base_paths) {
+    LOG(INFO) << "Auto-discovered CGroup base path: " << base_path;
+
+    auto self_cgroup_procs_status = FindSelfCGroupProcs(base_path);
+    if (!self_cgroup_procs_status.ok()) {
+      LOG(WARNING) << "Could not find self in cgroup procs. Trying next base path.";
+      continue;
+    }
+    auto self_cgroup_procs = self_cgroup_procs_status.ConsumeValueOrDie();
+    LOG(INFO) << "Auto-discovered example path: " << self_cgroup_procs;
+
+    auto cgroup_path_template_status = CreateCGroupTemplateSpecFromPath(self_cgroup_procs);
+    if (!cgroup_path_template_status.ok()) {
+      LOG(WARNING) << absl::Substitute(
+          "Failed to create cgroup template spec from path $0. Trying next base path.",
+          self_cgroup_procs);
+      continue;
+    }
+    auto cgroup_path_template = cgroup_path_template_status.ConsumeValueOrDie();
+    LOG(INFO) << "Auto-discovered template: " << cgroup_path_template.templated_path;
 
-  return cgroup_path_template;
+    return cgroup_path_template;
+  }
+  return error::NotFound("Unable to auto discover cgroup template from $0",
+                         absl::StrJoin(base_paths, ", "));
 }
 
 StatusOr<std::unique_ptr<CGroupPathResolver>> CGroupPathResolver::Create(
@@ -222,51 +244,52 @@ Status LegacyCGroupPathResolver::Init(std::string_view sysfs_path) {
   //  $2 = container runtime
   // These template parameters are resolved by calls to PodPath.
   // Different hosts may mount different cgroup dirs. Try a couple for robustness.
-  PX_ASSIGN_OR_RETURN(std::string cgroup_dir, CGroupBasePath(sysfs_path));
-
-  // Attempt assuming naming scheme #1.
-  std::string cgroup_kubepods_base_path = absl::Substitute("$0/kubepods", cgroup_dir);
-  if (fs::Exists(cgroup_kubepods_base_path)) {
-    cgroup_kubepod_guaranteed_path_template_ =
-        absl::StrCat(cgroup_kubepods_base_path, "/pod$0/$1/cgroup.procs");
-    cgroup_kubepod_besteffort_path_template_ =
-        absl::StrCat(cgroup_kubepods_base_path, "/besteffort/pod$0/$1/cgroup.procs");
-    cgroup_kubepod_burstable_path_template_ =
-        absl::StrCat(cgroup_kubepods_base_path, "/burstable/pod$0/$1/cgroup.procs");
-    cgroup_kubepod_convert_dashes_ = false;
-    return Status::OK();
-  }
+  PX_ASSIGN_OR_RETURN(std::vector<std::string> cgroup_dirs, CGroupBasePaths(sysfs_path));
 
-  // Attempt assuming naming scheme #3.
-  // Must be before the scheme below, since there have been systems that have both paths,
-  // but this must take priority.
-  cgroup_kubepods_base_path = absl::Substitute("$0/system.slice/containerd.service", cgroup_dir);
-  if (fs::Exists(cgroup_kubepods_base_path)) {
-    cgroup_kubepod_guaranteed_path_template_ =
-        absl::StrCat(cgroup_kubepods_base_path, "/kubepods-pod$0.slice:$2:$1/cgroup.procs");
-    cgroup_kubepod_besteffort_path_template_ = absl::StrCat(
-        cgroup_kubepods_base_path, "/kubepods-besteffort-pod$0.slice:$2:$1/cgroup.procs");
-    cgroup_kubepod_burstable_path_template_ = absl::StrCat(
-        cgroup_kubepods_base_path, "/kubepods-burstable-pod$0.slice:$2:$1/cgroup.procs");
-    cgroup_kubepod_convert_dashes_ = true;
-    return Status::OK();
-  }
+  for (const auto& cgroup_dir : cgroup_dirs) {
+    // Attempt assuming naming scheme #1.
+    std::string cgroup_kubepods_base_path = absl::Substitute("$0/kubepods", cgroup_dir);
+    if (fs::Exists(cgroup_kubepods_base_path)) {
+      cgroup_kubepod_guaranteed_path_template_ =
+          absl::StrCat(cgroup_kubepods_base_path, "/pod$0/$1/cgroup.procs");
+      cgroup_kubepod_besteffort_path_template_ =
+          absl::StrCat(cgroup_kubepods_base_path, "/besteffort/pod$0/$1/cgroup.procs");
+      cgroup_kubepod_burstable_path_template_ =
+          absl::StrCat(cgroup_kubepods_base_path, "/burstable/pod$0/$1/cgroup.procs");
+      cgroup_kubepod_convert_dashes_ = false;
+      return Status::OK();
+    }
 
-  // Attempt assuming naming scheme #2.
-  cgroup_kubepods_base_path = absl::Substitute("$0/kubepods.slice", cgroup_dir);
-  if (fs::Exists(cgroup_kubepods_base_path)) {
-    cgroup_kubepod_guaranteed_path_template_ =
-        absl::StrCat(cgroup_kubepods_base_path, "/kubepods-pod$0.slice/$2-$1.scope/cgroup.procs");
-    cgroup_kubepod_besteffort_path_template_ = absl::StrCat(
-        cgroup_kubepods_base_path,
-        "/kubepods-besteffort.slice/kubepods-besteffort-pod$0.slice/$2-$1.scope/cgroup.procs");
-    cgroup_kubepod_burstable_path_template_ = absl::StrCat(
-        cgroup_kubepods_base_path,
-        "/kubepods-burstable.slice/kubepods-burstable-pod$0.slice/$2-$1.scope/cgroup.procs");
-    cgroup_kubepod_convert_dashes_ = true;
-    return Status::OK();
-  }
+    // Attempt assuming naming scheme #3.
+    // Must be before the scheme below, since there have been systems that have both paths,
+    // but this must take priority.
+    cgroup_kubepods_base_path = absl::Substitute("$0/system.slice/containerd.service", cgroup_dir);
+    if (fs::Exists(cgroup_kubepods_base_path)) {
+      cgroup_kubepod_guaranteed_path_template_ =
+          absl::StrCat(cgroup_kubepods_base_path, "/kubepods-pod$0.slice:$2:$1/cgroup.procs");
+      cgroup_kubepod_besteffort_path_template_ = absl::StrCat(
+          cgroup_kubepods_base_path, "/kubepods-besteffort-pod$0.slice:$2:$1/cgroup.procs");
+      cgroup_kubepod_burstable_path_template_ = absl::StrCat(
+          cgroup_kubepods_base_path, "/kubepods-burstable-pod$0.slice:$2:$1/cgroup.procs");
+      cgroup_kubepod_convert_dashes_ = true;
+      return Status::OK();
+    }
 
+    // Attempt assuming naming scheme #2.
+    cgroup_kubepods_base_path = absl::Substitute("$0/kubepods.slice", cgroup_dir);
+    if (fs::Exists(cgroup_kubepods_base_path)) {
+      cgroup_kubepod_guaranteed_path_template_ =
+          absl::StrCat(cgroup_kubepods_base_path, "/kubepods-pod$0.slice/$2-$1.scope/cgroup.procs");
+      cgroup_kubepod_besteffort_path_template_ = absl::StrCat(
+          cgroup_kubepods_base_path,
+          "/kubepods-besteffort.slice/kubepods-besteffort-pod$0.slice/$2-$1.scope/cgroup.procs");
+      cgroup_kubepod_burstable_path_template_ = absl::StrCat(
+          cgroup_kubepods_base_path,
+          "/kubepods-burstable.slice/kubepods-burstable-pod$0.slice/$2-$1.scope/cgroup.procs");
+      cgroup_kubepod_convert_dashes_ = true;
+      return Status::OK();
+    }
+  }
   return error::NotFound("Could not find kubepods slice under sysfs ($0)", sysfs_path);
 }
 
diff --git a/src/shared/metadata/cgroup_path_resolver_test.cc b/src/shared/metadata/cgroup_path_resolver_test.cc
index 8046908c80b..34682f02294 100644
--- a/src/shared/metadata/cgroup_path_resolver_test.cc
+++ b/src/shared/metadata/cgroup_path_resolver_test.cc
@@ -317,6 +317,7 @@ TEST(LegacyCGroupPathResolverTest, StandardFormat) {
 }
 
 TEST(LeagcyCGroupPathResolverTest, Cgroup2Format) {
+  PX_SET_FOR_SCOPE(FLAGS_force_cgroup2_mode, true);
   ASSERT_OK_AND_ASSIGN(
       auto path_resolver,
       LegacyCGroupPathResolver::Create(GetSysFsPathFromTestDataFile(
@@ -326,7 +327,6 @@ TEST(LeagcyCGroupPathResolverTest, Cgroup2Format) {
           "cgroup.procs",
           "testdata/sysfs3")));
 
-  FLAGS_force_cgroup2_mode = true;
   EXPECT_EQ(
       GetPathToTestDataFile(
           "testdata/sysfs3/cgroup/kubepods.slice/kubepods-besteffort.slice/"

From 6593cb2416f74565c21c28cc5b68c99728641880 Mon Sep 17 00:00:00 2001
From: Dom Del Nano <ddelnano@gmail.com>
Date: Tue, 13 Aug 2024 19:33:54 +0000
Subject: [PATCH 2/6] Add test that simulates merged cgroup v1 and v2
 directories

Signed-off-by: Dom Del Nano <ddelnano@gmail.com>
---
 .../metadata/cgroup_path_resolver_test.cc     | 40 +++++++++++++++++++
 .../cpu,cpuacct/kubepods.slice/cgroup.procs   |  0
 .../kubepods-besteffort.slice/cgroup.procs    |  0
 .../cgroup.procs                              |  0
 .../cgroup.procs                              |  0
 .../cgroup.procs                              |  0
 .../cgroup.procs                              |  0
 .../cgroup.procs                              |  0
 .../cgroup.procs                              |  0
 .../cgroup.procs                              |  3 ++
 .../kubepods-burstable.slice/cgroup.procs     |  0
 .../cgroup.procs                              |  0
 .../cgroup.procs                              |  0
 .../cgroup.procs                              |  0
 .../cgroup.procs                              |  0
 .../cgroup.procs                              |  0
 .../cgroup.procs                              |  0
 .../cgroup.procs                              |  0
 .../cgroup.procs                              |  0
 .../cgroup.procs                              |  0
 .../cgroup.procs                              |  0
 .../cgroup.procs                              |  0
 .../cgroup.procs                              |  0
 .../cgroup.procs                              |  0
 24 files changed, 43 insertions(+)
 create mode 100644 src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/cgroup.procs
 create mode 100644 src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-besteffort.slice/cgroup.procs
 create mode 100644 src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-besteffort.slice/kubepods-besteffort-pod15b6301f_94d0_44ac_a2a8_6816c7a3fa32.slice/cgroup.procs
 create mode 100644 src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-besteffort.slice/kubepods-besteffort-pod15b6301f_94d0_44ac_a2a8_6816c7a3fa32.slice/docker-159757ef9efdc09be13490c8615f1402c170cdd406dad6053ebe0df2db89fcaa.scope/cgroup.procs
 create mode 100644 src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-besteffort.slice/kubepods-besteffort-pod15b6301f_94d0_44ac_a2a8_6816c7a3fa32.slice/docker-902141149b846f0d8643fc402ebef09b1e8ce474a0e217373dc4c7cb27f798fd.scope/cgroup.procs
 create mode 100644 src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-besteffort.slice/kubepods-besteffort-pod15b6301f_94d0_44ac_a2a8_6816c7a3fa32.slice/docker-c4fde06bc7b55d4b0903e3f7d2a21980727f095fc03ba04bee9df95a5913d763.scope/cgroup.procs
 create mode 100644 src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-besteffort.slice/kubepods-besteffort-podd7f73b62_b4bf_41dc_a50d_5bdf3b02d3e5.slice/cgroup.procs
 create mode 100644 src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-besteffort.slice/kubepods-besteffort-podd7f73b62_b4bf_41dc_a50d_5bdf3b02d3e5.slice/docker-2e0a27214023acd90b19a25051a9e7a6dfb151064cb88a4171b00c7b9471ebb9.scope/cgroup.procs
 create mode 100644 src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-besteffort.slice/kubepods-besteffort-podd7f73b62_b4bf_41dc_a50d_5bdf3b02d3e5.slice/docker-37d1600d21282ce1bc32ebbaf99bf2241f66ca096109a4cb5484e2aa305514b4.scope/cgroup.procs
 create mode 100644 src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-burstable.slice/cgroup.procs
 create mode 100644 src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-burstable.slice/kubepods-burstable-pod4db1ed35_32d4_4d59_a642_6bb212c9f748.slice/cgroup.procs
 create mode 100644 src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-burstable.slice/kubepods-burstable-pod4db1ed35_32d4_4d59_a642_6bb212c9f748.slice/docker-43b2d6cee511f098634f3b19ffe099a8fedad9e55e8c540a0b115f19fd13f0d1.scope/cgroup.procs
 create mode 100644 src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-burstable.slice/kubepods-burstable-pod4db1ed35_32d4_4d59_a642_6bb212c9f748.slice/docker-b81071c8954ddfea7cb843250dd25ad40670da29960cd98fa2024efb8672c46f.scope/cgroup.procs
 create mode 100644 src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-burstable.slice/kubepods-burstable-pod5a1d1140_a486_478c_afae_bbc975ff9c3b.slice/cgroup.procs
 create mode 100644 src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-burstable.slice/kubepods-burstable-pod5a1d1140_a486_478c_afae_bbc975ff9c3b.slice/cri-containerd-2b41fe4bb7a365960f1e7ed6c09651252b29387b44c9e14ad17e3bc392e7c640.scope/cgroup.procs
 create mode 100644 src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-burstable.slice/kubepods-burstable-pod5a1d1140_a486_478c_afae_bbc975ff9c3b.slice/crio-2b41fe4bb7a365960f1e7ed6c09651252b29387b44c9e14ad17e3bc392e7c640.scope/cgroup.procs
 create mode 100644 src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-burstable.slice/kubepods-burstable-pod5a1d1140_a486_478c_afae_bbc975ff9c3b.slice/docker-2b41fe4bb7a365960f1e7ed6c09651252b29387b44c9e14ad17e3bc392e7c640.scope/cgroup.procs
 create mode 100644 src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-burstable.slice/kubepods-burstable-pod5a1d1140_a486_478c_afae_bbc975ff9c3b.slice/docker-4e33ed25bba45abc0dcba947ee29206174600e6a5d0e509547687e57f0588888.scope/cgroup.procs
 create mode 100644 src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-pod8dbc5577_d0e2_4706_8787_57d52c03ddf2.slice/cgroup.procs
 create mode 100644 src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-pod8dbc5577_d0e2_4706_8787_57d52c03ddf2.slice/docker-14011c7d92a9e513dfd69211da0413dbf319a5e45a02b354ba6e98e10272542d.scope/cgroup.procs
 create mode 100644 src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-pod8dbc5577_d0e2_4706_8787_57d52c03ddf2.slice/docker-b9055cee13e1f37ecb63030593b27f4adc43cbd6629aa7781ffdf53fbaecfa46.scope/cgroup.procs
 create mode 100644 src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/kubepods.slice/kubepods-besteffort.slice/kubepods-besteffort-pod47810e8e_b9cb_4ac6_b12d_9e0577fa8237.slice/docker-28efca84cc7d707bdfbc5646144bba6c4417de2cf63f8583179603ce434d6dfe.scope/cgroup.procs
 create mode 100644 src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/kubepods.slice/kubepods-burstable.slice/kubepods-burstable-pod16de73f898f4460d96d28cf19ba8407f.slice/docker-23ac1540f833b029f76af6a513c4861a54bb9b77a6e3648b6f8392b1a09686ba.scope/cgroup.procs

diff --git a/src/shared/metadata/cgroup_path_resolver_test.cc b/src/shared/metadata/cgroup_path_resolver_test.cc
index 34682f02294..c7afb33a71e 100644
--- a/src/shared/metadata/cgroup_path_resolver_test.cc
+++ b/src/shared/metadata/cgroup_path_resolver_test.cc
@@ -348,6 +348,46 @@ TEST(LeagcyCGroupPathResolverTest, Cgroup2Format) {
                              ContainerType::kDocker));
 }
 
+// This tests simulates a system where cgroup v1 and v2 are both present. This has been observed
+// in OVH's managed kubernetes service.
+//
+// The testdata/sysfs4-cgroup-v1andv2 directory was created with the following commands:
+// sudo mount -t overlay overlay -o lowerdir=sysfs2/cgroup:sysfs3/cgroup \
+// sysfs4-cgroup-v1andv2/cgroup
+//
+// sysfsv2 and sysfsv3 model cgroupv1 and cgroupv2 respectively.
+TEST(LeagcyCGroupPathResolverTest, Cgroup2With1) {
+  PX_SET_FOR_SCOPE(FLAGS_force_cgroup2_mode, true);
+  ASSERT_OK_AND_ASSIGN(
+      auto path_resolver,
+      LegacyCGroupPathResolver::Create(GetSysFsPathFromTestDataFile(
+          "testdata/sysfs4-cgroup-v1andv2/cgroup/kubepods.slice/kubepods-besteffort.slice/"
+          "kubepods-besteffort-pod47810e8e_b9cb_4ac6_b12d_9e0577fa8237.slice/"
+          "docker-28efca84cc7d707bdfbc5646144bba6c4417de2cf63f8583179603ce434d6dfe.scope/"
+          "cgroup.procs",
+          "testdata/sysfs4-cgroup-v1andv2")));
+
+  EXPECT_EQ(
+      GetPathToTestDataFile(
+          "testdata/sysfs4-cgroup-v1andv2/cgroup/kubepods.slice/kubepods-besteffort.slice/"
+          "kubepods-besteffort-pod47810e8e_b9cb_4ac6_b12d_9e0577fa8237.slice/"
+          "docker-28efca84cc7d707bdfbc5646144bba6c4417de2cf63f8583179603ce434d6dfe.scope/"
+          "cgroup.procs"),
+      path_resolver->PodPath(PodQOSClass::kBestEffort, "47810e8e_b9cb_4ac6_b12d_9e0577fa8237",
+                             "28efca84cc7d707bdfbc5646144bba6c4417de2cf63f8583179603ce434d6dfe",
+                             ContainerType::kDocker));
+
+  EXPECT_EQ(
+      GetPathToTestDataFile(
+          "testdata/sysfs4-cgroup-v1andv2/cgroup/kubepods.slice/kubepods-burstable.slice/"
+          "kubepods-burstable-pod16de73f898f4460d96d28cf19ba8407f.slice/"
+          "docker-23ac1540f833b029f76af6a513c4861a54bb9b77a6e3648b6f8392b1a09686ba.scope/"
+          "cgroup.procs"),
+      path_resolver->PodPath(PodQOSClass::kBurstable, "16de73f898f4460d96d28cf19ba8407f",
+                             "23ac1540f833b029f76af6a513c4861a54bb9b77a6e3648b6f8392b1a09686ba",
+                             ContainerType::kDocker));
+}
+
 TEST(CGroupPathResolver, Cgroup2Format) {
   std::string cgroup_kubepod_path =
       "/sys/fs/cgroup/kubepods.slice/"
diff --git a/src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/cgroup.procs b/src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/cgroup.procs
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-besteffort.slice/cgroup.procs b/src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-besteffort.slice/cgroup.procs
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-besteffort.slice/kubepods-besteffort-pod15b6301f_94d0_44ac_a2a8_6816c7a3fa32.slice/cgroup.procs b/src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-besteffort.slice/kubepods-besteffort-pod15b6301f_94d0_44ac_a2a8_6816c7a3fa32.slice/cgroup.procs
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-besteffort.slice/kubepods-besteffort-pod15b6301f_94d0_44ac_a2a8_6816c7a3fa32.slice/docker-159757ef9efdc09be13490c8615f1402c170cdd406dad6053ebe0df2db89fcaa.scope/cgroup.procs b/src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-besteffort.slice/kubepods-besteffort-pod15b6301f_94d0_44ac_a2a8_6816c7a3fa32.slice/docker-159757ef9efdc09be13490c8615f1402c170cdd406dad6053ebe0df2db89fcaa.scope/cgroup.procs
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-besteffort.slice/kubepods-besteffort-pod15b6301f_94d0_44ac_a2a8_6816c7a3fa32.slice/docker-902141149b846f0d8643fc402ebef09b1e8ce474a0e217373dc4c7cb27f798fd.scope/cgroup.procs b/src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-besteffort.slice/kubepods-besteffort-pod15b6301f_94d0_44ac_a2a8_6816c7a3fa32.slice/docker-902141149b846f0d8643fc402ebef09b1e8ce474a0e217373dc4c7cb27f798fd.scope/cgroup.procs
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-besteffort.slice/kubepods-besteffort-pod15b6301f_94d0_44ac_a2a8_6816c7a3fa32.slice/docker-c4fde06bc7b55d4b0903e3f7d2a21980727f095fc03ba04bee9df95a5913d763.scope/cgroup.procs b/src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-besteffort.slice/kubepods-besteffort-pod15b6301f_94d0_44ac_a2a8_6816c7a3fa32.slice/docker-c4fde06bc7b55d4b0903e3f7d2a21980727f095fc03ba04bee9df95a5913d763.scope/cgroup.procs
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-besteffort.slice/kubepods-besteffort-podd7f73b62_b4bf_41dc_a50d_5bdf3b02d3e5.slice/cgroup.procs b/src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-besteffort.slice/kubepods-besteffort-podd7f73b62_b4bf_41dc_a50d_5bdf3b02d3e5.slice/cgroup.procs
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-besteffort.slice/kubepods-besteffort-podd7f73b62_b4bf_41dc_a50d_5bdf3b02d3e5.slice/docker-2e0a27214023acd90b19a25051a9e7a6dfb151064cb88a4171b00c7b9471ebb9.scope/cgroup.procs b/src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-besteffort.slice/kubepods-besteffort-podd7f73b62_b4bf_41dc_a50d_5bdf3b02d3e5.slice/docker-2e0a27214023acd90b19a25051a9e7a6dfb151064cb88a4171b00c7b9471ebb9.scope/cgroup.procs
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-besteffort.slice/kubepods-besteffort-podd7f73b62_b4bf_41dc_a50d_5bdf3b02d3e5.slice/docker-37d1600d21282ce1bc32ebbaf99bf2241f66ca096109a4cb5484e2aa305514b4.scope/cgroup.procs b/src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-besteffort.slice/kubepods-besteffort-podd7f73b62_b4bf_41dc_a50d_5bdf3b02d3e5.slice/docker-37d1600d21282ce1bc32ebbaf99bf2241f66ca096109a4cb5484e2aa305514b4.scope/cgroup.procs
new file mode 100644
index 00000000000..af7864ba2f0
--- /dev/null
+++ b/src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-besteffort.slice/kubepods-besteffort-podd7f73b62_b4bf_41dc_a50d_5bdf3b02d3e5.slice/docker-37d1600d21282ce1bc32ebbaf99bf2241f66ca096109a4cb5484e2aa305514b4.scope/cgroup.procs
@@ -0,0 +1,3 @@
+123
+456
+789
diff --git a/src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-burstable.slice/cgroup.procs b/src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-burstable.slice/cgroup.procs
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-burstable.slice/kubepods-burstable-pod4db1ed35_32d4_4d59_a642_6bb212c9f748.slice/cgroup.procs b/src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-burstable.slice/kubepods-burstable-pod4db1ed35_32d4_4d59_a642_6bb212c9f748.slice/cgroup.procs
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-burstable.slice/kubepods-burstable-pod4db1ed35_32d4_4d59_a642_6bb212c9f748.slice/docker-43b2d6cee511f098634f3b19ffe099a8fedad9e55e8c540a0b115f19fd13f0d1.scope/cgroup.procs b/src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-burstable.slice/kubepods-burstable-pod4db1ed35_32d4_4d59_a642_6bb212c9f748.slice/docker-43b2d6cee511f098634f3b19ffe099a8fedad9e55e8c540a0b115f19fd13f0d1.scope/cgroup.procs
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-burstable.slice/kubepods-burstable-pod4db1ed35_32d4_4d59_a642_6bb212c9f748.slice/docker-b81071c8954ddfea7cb843250dd25ad40670da29960cd98fa2024efb8672c46f.scope/cgroup.procs b/src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-burstable.slice/kubepods-burstable-pod4db1ed35_32d4_4d59_a642_6bb212c9f748.slice/docker-b81071c8954ddfea7cb843250dd25ad40670da29960cd98fa2024efb8672c46f.scope/cgroup.procs
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-burstable.slice/kubepods-burstable-pod5a1d1140_a486_478c_afae_bbc975ff9c3b.slice/cgroup.procs b/src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-burstable.slice/kubepods-burstable-pod5a1d1140_a486_478c_afae_bbc975ff9c3b.slice/cgroup.procs
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-burstable.slice/kubepods-burstable-pod5a1d1140_a486_478c_afae_bbc975ff9c3b.slice/cri-containerd-2b41fe4bb7a365960f1e7ed6c09651252b29387b44c9e14ad17e3bc392e7c640.scope/cgroup.procs b/src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-burstable.slice/kubepods-burstable-pod5a1d1140_a486_478c_afae_bbc975ff9c3b.slice/cri-containerd-2b41fe4bb7a365960f1e7ed6c09651252b29387b44c9e14ad17e3bc392e7c640.scope/cgroup.procs
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-burstable.slice/kubepods-burstable-pod5a1d1140_a486_478c_afae_bbc975ff9c3b.slice/crio-2b41fe4bb7a365960f1e7ed6c09651252b29387b44c9e14ad17e3bc392e7c640.scope/cgroup.procs b/src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-burstable.slice/kubepods-burstable-pod5a1d1140_a486_478c_afae_bbc975ff9c3b.slice/crio-2b41fe4bb7a365960f1e7ed6c09651252b29387b44c9e14ad17e3bc392e7c640.scope/cgroup.procs
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-burstable.slice/kubepods-burstable-pod5a1d1140_a486_478c_afae_bbc975ff9c3b.slice/docker-2b41fe4bb7a365960f1e7ed6c09651252b29387b44c9e14ad17e3bc392e7c640.scope/cgroup.procs b/src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-burstable.slice/kubepods-burstable-pod5a1d1140_a486_478c_afae_bbc975ff9c3b.slice/docker-2b41fe4bb7a365960f1e7ed6c09651252b29387b44c9e14ad17e3bc392e7c640.scope/cgroup.procs
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-burstable.slice/kubepods-burstable-pod5a1d1140_a486_478c_afae_bbc975ff9c3b.slice/docker-4e33ed25bba45abc0dcba947ee29206174600e6a5d0e509547687e57f0588888.scope/cgroup.procs b/src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-burstable.slice/kubepods-burstable-pod5a1d1140_a486_478c_afae_bbc975ff9c3b.slice/docker-4e33ed25bba45abc0dcba947ee29206174600e6a5d0e509547687e57f0588888.scope/cgroup.procs
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-pod8dbc5577_d0e2_4706_8787_57d52c03ddf2.slice/cgroup.procs b/src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-pod8dbc5577_d0e2_4706_8787_57d52c03ddf2.slice/cgroup.procs
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-pod8dbc5577_d0e2_4706_8787_57d52c03ddf2.slice/docker-14011c7d92a9e513dfd69211da0413dbf319a5e45a02b354ba6e98e10272542d.scope/cgroup.procs b/src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-pod8dbc5577_d0e2_4706_8787_57d52c03ddf2.slice/docker-14011c7d92a9e513dfd69211da0413dbf319a5e45a02b354ba6e98e10272542d.scope/cgroup.procs
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-pod8dbc5577_d0e2_4706_8787_57d52c03ddf2.slice/docker-b9055cee13e1f37ecb63030593b27f4adc43cbd6629aa7781ffdf53fbaecfa46.scope/cgroup.procs b/src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-pod8dbc5577_d0e2_4706_8787_57d52c03ddf2.slice/docker-b9055cee13e1f37ecb63030593b27f4adc43cbd6629aa7781ffdf53fbaecfa46.scope/cgroup.procs
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/kubepods.slice/kubepods-besteffort.slice/kubepods-besteffort-pod47810e8e_b9cb_4ac6_b12d_9e0577fa8237.slice/docker-28efca84cc7d707bdfbc5646144bba6c4417de2cf63f8583179603ce434d6dfe.scope/cgroup.procs b/src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/kubepods.slice/kubepods-besteffort.slice/kubepods-besteffort-pod47810e8e_b9cb_4ac6_b12d_9e0577fa8237.slice/docker-28efca84cc7d707bdfbc5646144bba6c4417de2cf63f8583179603ce434d6dfe.scope/cgroup.procs
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/kubepods.slice/kubepods-burstable.slice/kubepods-burstable-pod16de73f898f4460d96d28cf19ba8407f.slice/docker-23ac1540f833b029f76af6a513c4861a54bb9b77a6e3648b6f8392b1a09686ba.scope/cgroup.procs b/src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/kubepods.slice/kubepods-burstable.slice/kubepods-burstable-pod16de73f898f4460d96d28cf19ba8407f.slice/docker-23ac1540f833b029f76af6a513c4861a54bb9b77a6e3648b6f8392b1a09686ba.scope/cgroup.procs
new file mode 100644
index 00000000000..e69de29bb2d

From 15a2a332680dbdfd604580f37436bbf8cf63e06b Mon Sep 17 00:00:00 2001
From: Dom Del Nano <ddelnano@gmail.com>
Date: Thu, 15 Aug 2024 22:31:21 +0000
Subject: [PATCH 3/6] Rename --force_cgroup_mode to
 --test_only_force_cgroup_mode

Signed-off-by: Dom Del Nano <ddelnano@gmail.com>
---
 src/shared/metadata/cgroup_path_resolver.cc      | 6 +++---
 src/shared/metadata/cgroup_path_resolver.h       | 2 +-
 src/shared/metadata/cgroup_path_resolver_test.cc | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/shared/metadata/cgroup_path_resolver.cc b/src/shared/metadata/cgroup_path_resolver.cc
index 7bac3d55ade..dbe6702c450 100644
--- a/src/shared/metadata/cgroup_path_resolver.cc
+++ b/src/shared/metadata/cgroup_path_resolver.cc
@@ -27,7 +27,7 @@
 #include "src/common/fs/fs_wrapper.h"
 #include "src/shared/metadata/cgroup_path_resolver.h"
 
-DEFINE_bool(force_cgroup2_mode, false, "Flag to force assume cgroup2 fs for testing purposes");
+DEFINE_bool(test_only_force_cgroup2_mode, false, "Flag to force assume cgroup2 fs for testing purposes");
 
 namespace px {
 namespace md {
@@ -53,8 +53,8 @@ StatusOr<std::vector<std::string>> CGroupBasePaths(std::string_view sysfs_path)
   auto fs_status = statfs(cgv2_base_path.c_str(), &info);
   bool cgroupv2 = (fs_status == 0) && (info.f_type == CGROUP2_SUPER_MAGIC);
 
-  if (cgroupv2 || FLAGS_force_cgroup2_mode) {
-    if (FLAGS_force_cgroup2_mode) {
+  if (cgroupv2 || FLAGS_test_only_force_cgroup2_mode) {
+    if (FLAGS_test_only_force_cgroup2_mode) {
       return std::vector{cgv2_base_path};
     }
     base_paths.push_back(cgv2_base_path);
diff --git a/src/shared/metadata/cgroup_path_resolver.h b/src/shared/metadata/cgroup_path_resolver.h
index b3aca9a5ea9..fd123ac981b 100644
--- a/src/shared/metadata/cgroup_path_resolver.h
+++ b/src/shared/metadata/cgroup_path_resolver.h
@@ -27,7 +27,7 @@
 #include "src/common/system/system.h"
 #include "src/shared/metadata/k8s_objects.h"
 
-DECLARE_bool(force_cgroup2_mode);
+DECLARE_bool(test_only_force_cgroup2_mode);
 
 namespace px {
 namespace md {
diff --git a/src/shared/metadata/cgroup_path_resolver_test.cc b/src/shared/metadata/cgroup_path_resolver_test.cc
index c7afb33a71e..74626f1b2aa 100644
--- a/src/shared/metadata/cgroup_path_resolver_test.cc
+++ b/src/shared/metadata/cgroup_path_resolver_test.cc
@@ -317,7 +317,7 @@ TEST(LegacyCGroupPathResolverTest, StandardFormat) {
 }
 
 TEST(LeagcyCGroupPathResolverTest, Cgroup2Format) {
-  PX_SET_FOR_SCOPE(FLAGS_force_cgroup2_mode, true);
+  PX_SET_FOR_SCOPE(FLAGS_test_only_force_cgroup2_mode, true);
   ASSERT_OK_AND_ASSIGN(
       auto path_resolver,
       LegacyCGroupPathResolver::Create(GetSysFsPathFromTestDataFile(
@@ -357,7 +357,7 @@ TEST(LeagcyCGroupPathResolverTest, Cgroup2Format) {
 //
 // sysfsv2 and sysfsv3 model cgroupv1 and cgroupv2 respectively.
 TEST(LeagcyCGroupPathResolverTest, Cgroup2With1) {
-  PX_SET_FOR_SCOPE(FLAGS_force_cgroup2_mode, true);
+  PX_SET_FOR_SCOPE(FLAGS_test_only_force_cgroup2_mode, true);
   ASSERT_OK_AND_ASSIGN(
       auto path_resolver,
       LegacyCGroupPathResolver::Create(GetSysFsPathFromTestDataFile(

From 948cc8f6b5069dda674a5e70cbe066f64da16369 Mon Sep 17 00:00:00 2001
From: Dom Del Nano <ddelnano@gmail.com>
Date: Fri, 16 Aug 2024 14:53:29 +0000
Subject: [PATCH 4/6] Remove test that provides minimal coverage. Add TODO
 explaining the scenarios that should be tested

Signed-off-by: Dom Del Nano <ddelnano@gmail.com>
---
 .../metadata/cgroup_path_resolver_test.cc     | 51 ++++---------------
 .../cpu,cpuacct/kubepods.slice/cgroup.procs   |  0
 .../kubepods-besteffort.slice/cgroup.procs    |  0
 .../cgroup.procs                              |  0
 .../cgroup.procs                              |  0
 .../cgroup.procs                              |  0
 .../cgroup.procs                              |  0
 .../cgroup.procs                              |  0
 .../cgroup.procs                              |  0
 .../cgroup.procs                              |  3 --
 .../kubepods-burstable.slice/cgroup.procs     |  0
 .../cgroup.procs                              |  0
 .../cgroup.procs                              |  0
 .../cgroup.procs                              |  0
 .../cgroup.procs                              |  0
 .../cgroup.procs                              |  0
 .../cgroup.procs                              |  0
 .../cgroup.procs                              |  0
 .../cgroup.procs                              |  0
 .../cgroup.procs                              |  0
 .../cgroup.procs                              |  0
 .../cgroup.procs                              |  0
 .../cgroup.procs                              |  0
 .../cgroup.procs                              |  0
 24 files changed, 11 insertions(+), 43 deletions(-)
 delete mode 100644 src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/cgroup.procs
 delete mode 100644 src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-besteffort.slice/cgroup.procs
 delete mode 100644 src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-besteffort.slice/kubepods-besteffort-pod15b6301f_94d0_44ac_a2a8_6816c7a3fa32.slice/cgroup.procs
 delete mode 100644 src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-besteffort.slice/kubepods-besteffort-pod15b6301f_94d0_44ac_a2a8_6816c7a3fa32.slice/docker-159757ef9efdc09be13490c8615f1402c170cdd406dad6053ebe0df2db89fcaa.scope/cgroup.procs
 delete mode 100644 src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-besteffort.slice/kubepods-besteffort-pod15b6301f_94d0_44ac_a2a8_6816c7a3fa32.slice/docker-902141149b846f0d8643fc402ebef09b1e8ce474a0e217373dc4c7cb27f798fd.scope/cgroup.procs
 delete mode 100644 src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-besteffort.slice/kubepods-besteffort-pod15b6301f_94d0_44ac_a2a8_6816c7a3fa32.slice/docker-c4fde06bc7b55d4b0903e3f7d2a21980727f095fc03ba04bee9df95a5913d763.scope/cgroup.procs
 delete mode 100644 src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-besteffort.slice/kubepods-besteffort-podd7f73b62_b4bf_41dc_a50d_5bdf3b02d3e5.slice/cgroup.procs
 delete mode 100644 src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-besteffort.slice/kubepods-besteffort-podd7f73b62_b4bf_41dc_a50d_5bdf3b02d3e5.slice/docker-2e0a27214023acd90b19a25051a9e7a6dfb151064cb88a4171b00c7b9471ebb9.scope/cgroup.procs
 delete mode 100644 src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-besteffort.slice/kubepods-besteffort-podd7f73b62_b4bf_41dc_a50d_5bdf3b02d3e5.slice/docker-37d1600d21282ce1bc32ebbaf99bf2241f66ca096109a4cb5484e2aa305514b4.scope/cgroup.procs
 delete mode 100644 src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-burstable.slice/cgroup.procs
 delete mode 100644 src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-burstable.slice/kubepods-burstable-pod4db1ed35_32d4_4d59_a642_6bb212c9f748.slice/cgroup.procs
 delete mode 100644 src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-burstable.slice/kubepods-burstable-pod4db1ed35_32d4_4d59_a642_6bb212c9f748.slice/docker-43b2d6cee511f098634f3b19ffe099a8fedad9e55e8c540a0b115f19fd13f0d1.scope/cgroup.procs
 delete mode 100644 src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-burstable.slice/kubepods-burstable-pod4db1ed35_32d4_4d59_a642_6bb212c9f748.slice/docker-b81071c8954ddfea7cb843250dd25ad40670da29960cd98fa2024efb8672c46f.scope/cgroup.procs
 delete mode 100644 src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-burstable.slice/kubepods-burstable-pod5a1d1140_a486_478c_afae_bbc975ff9c3b.slice/cgroup.procs
 delete mode 100644 src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-burstable.slice/kubepods-burstable-pod5a1d1140_a486_478c_afae_bbc975ff9c3b.slice/cri-containerd-2b41fe4bb7a365960f1e7ed6c09651252b29387b44c9e14ad17e3bc392e7c640.scope/cgroup.procs
 delete mode 100644 src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-burstable.slice/kubepods-burstable-pod5a1d1140_a486_478c_afae_bbc975ff9c3b.slice/crio-2b41fe4bb7a365960f1e7ed6c09651252b29387b44c9e14ad17e3bc392e7c640.scope/cgroup.procs
 delete mode 100644 src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-burstable.slice/kubepods-burstable-pod5a1d1140_a486_478c_afae_bbc975ff9c3b.slice/docker-2b41fe4bb7a365960f1e7ed6c09651252b29387b44c9e14ad17e3bc392e7c640.scope/cgroup.procs
 delete mode 100644 src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-burstable.slice/kubepods-burstable-pod5a1d1140_a486_478c_afae_bbc975ff9c3b.slice/docker-4e33ed25bba45abc0dcba947ee29206174600e6a5d0e509547687e57f0588888.scope/cgroup.procs
 delete mode 100644 src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-pod8dbc5577_d0e2_4706_8787_57d52c03ddf2.slice/cgroup.procs
 delete mode 100644 src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-pod8dbc5577_d0e2_4706_8787_57d52c03ddf2.slice/docker-14011c7d92a9e513dfd69211da0413dbf319a5e45a02b354ba6e98e10272542d.scope/cgroup.procs
 delete mode 100644 src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-pod8dbc5577_d0e2_4706_8787_57d52c03ddf2.slice/docker-b9055cee13e1f37ecb63030593b27f4adc43cbd6629aa7781ffdf53fbaecfa46.scope/cgroup.procs
 delete mode 100644 src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/kubepods.slice/kubepods-besteffort.slice/kubepods-besteffort-pod47810e8e_b9cb_4ac6_b12d_9e0577fa8237.slice/docker-28efca84cc7d707bdfbc5646144bba6c4417de2cf63f8583179603ce434d6dfe.scope/cgroup.procs
 delete mode 100644 src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/kubepods.slice/kubepods-burstable.slice/kubepods-burstable-pod16de73f898f4460d96d28cf19ba8407f.slice/docker-23ac1540f833b029f76af6a513c4861a54bb9b77a6e3648b6f8392b1a09686ba.scope/cgroup.procs

diff --git a/src/shared/metadata/cgroup_path_resolver_test.cc b/src/shared/metadata/cgroup_path_resolver_test.cc
index 74626f1b2aa..e512f76c75b 100644
--- a/src/shared/metadata/cgroup_path_resolver_test.cc
+++ b/src/shared/metadata/cgroup_path_resolver_test.cc
@@ -348,46 +348,6 @@ TEST(LeagcyCGroupPathResolverTest, Cgroup2Format) {
                              ContainerType::kDocker));
 }
 
-// This tests simulates a system where cgroup v1 and v2 are both present. This has been observed
-// in OVH's managed kubernetes service.
-//
-// The testdata/sysfs4-cgroup-v1andv2 directory was created with the following commands:
-// sudo mount -t overlay overlay -o lowerdir=sysfs2/cgroup:sysfs3/cgroup \
-// sysfs4-cgroup-v1andv2/cgroup
-//
-// sysfsv2 and sysfsv3 model cgroupv1 and cgroupv2 respectively.
-TEST(LeagcyCGroupPathResolverTest, Cgroup2With1) {
-  PX_SET_FOR_SCOPE(FLAGS_test_only_force_cgroup2_mode, true);
-  ASSERT_OK_AND_ASSIGN(
-      auto path_resolver,
-      LegacyCGroupPathResolver::Create(GetSysFsPathFromTestDataFile(
-          "testdata/sysfs4-cgroup-v1andv2/cgroup/kubepods.slice/kubepods-besteffort.slice/"
-          "kubepods-besteffort-pod47810e8e_b9cb_4ac6_b12d_9e0577fa8237.slice/"
-          "docker-28efca84cc7d707bdfbc5646144bba6c4417de2cf63f8583179603ce434d6dfe.scope/"
-          "cgroup.procs",
-          "testdata/sysfs4-cgroup-v1andv2")));
-
-  EXPECT_EQ(
-      GetPathToTestDataFile(
-          "testdata/sysfs4-cgroup-v1andv2/cgroup/kubepods.slice/kubepods-besteffort.slice/"
-          "kubepods-besteffort-pod47810e8e_b9cb_4ac6_b12d_9e0577fa8237.slice/"
-          "docker-28efca84cc7d707bdfbc5646144bba6c4417de2cf63f8583179603ce434d6dfe.scope/"
-          "cgroup.procs"),
-      path_resolver->PodPath(PodQOSClass::kBestEffort, "47810e8e_b9cb_4ac6_b12d_9e0577fa8237",
-                             "28efca84cc7d707bdfbc5646144bba6c4417de2cf63f8583179603ce434d6dfe",
-                             ContainerType::kDocker));
-
-  EXPECT_EQ(
-      GetPathToTestDataFile(
-          "testdata/sysfs4-cgroup-v1andv2/cgroup/kubepods.slice/kubepods-burstable.slice/"
-          "kubepods-burstable-pod16de73f898f4460d96d28cf19ba8407f.slice/"
-          "docker-23ac1540f833b029f76af6a513c4861a54bb9b77a6e3648b6f8392b1a09686ba.scope/"
-          "cgroup.procs"),
-      path_resolver->PodPath(PodQOSClass::kBurstable, "16de73f898f4460d96d28cf19ba8407f",
-                             "23ac1540f833b029f76af6a513c4861a54bb9b77a6e3648b6f8392b1a09686ba",
-                             ContainerType::kDocker));
-}
-
 TEST(CGroupPathResolver, Cgroup2Format) {
   std::string cgroup_kubepod_path =
       "/sys/fs/cgroup/kubepods.slice/"
@@ -419,5 +379,16 @@ TEST(CGroupPathResolver, Cgroup2Format) {
       "docker-a7638fe3934b37419cc56bca73465a02b354ba6e98e10272542d84eb2014dd62.scope/cgroup.procs");
 }
 
+/**
+ * TODO(ddelnano): Refactor the cgroup resolver code so that logic within AutoDiscoverCGroupPath
+ * and CGroupBasePaths can be tested. OVH's managed k8s failed to work with our logic because
+ * it enables cgroup v1 and v2 while the PEM existed in a v2 cgroup. Ideally our tests would
+ * cover the following scenarios for both LegacyCGroupPathResolver and CGroupPathResolver:
+ * 1. cgroup1 only
+ * 2. cgroup2 only
+ * 3. cgroup1+cgroup2 w/ cgroup1 failing (gh#XXX bug)
+ * 4. cgroup1+cgroup2 w/ cgroup1 succeeding
+ */
+
 }  // namespace md
 }  // namespace px
diff --git a/src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/cgroup.procs b/src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/cgroup.procs
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-besteffort.slice/cgroup.procs b/src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-besteffort.slice/cgroup.procs
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-besteffort.slice/kubepods-besteffort-pod15b6301f_94d0_44ac_a2a8_6816c7a3fa32.slice/cgroup.procs b/src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-besteffort.slice/kubepods-besteffort-pod15b6301f_94d0_44ac_a2a8_6816c7a3fa32.slice/cgroup.procs
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-besteffort.slice/kubepods-besteffort-pod15b6301f_94d0_44ac_a2a8_6816c7a3fa32.slice/docker-159757ef9efdc09be13490c8615f1402c170cdd406dad6053ebe0df2db89fcaa.scope/cgroup.procs b/src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-besteffort.slice/kubepods-besteffort-pod15b6301f_94d0_44ac_a2a8_6816c7a3fa32.slice/docker-159757ef9efdc09be13490c8615f1402c170cdd406dad6053ebe0df2db89fcaa.scope/cgroup.procs
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-besteffort.slice/kubepods-besteffort-pod15b6301f_94d0_44ac_a2a8_6816c7a3fa32.slice/docker-902141149b846f0d8643fc402ebef09b1e8ce474a0e217373dc4c7cb27f798fd.scope/cgroup.procs b/src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-besteffort.slice/kubepods-besteffort-pod15b6301f_94d0_44ac_a2a8_6816c7a3fa32.slice/docker-902141149b846f0d8643fc402ebef09b1e8ce474a0e217373dc4c7cb27f798fd.scope/cgroup.procs
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-besteffort.slice/kubepods-besteffort-pod15b6301f_94d0_44ac_a2a8_6816c7a3fa32.slice/docker-c4fde06bc7b55d4b0903e3f7d2a21980727f095fc03ba04bee9df95a5913d763.scope/cgroup.procs b/src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-besteffort.slice/kubepods-besteffort-pod15b6301f_94d0_44ac_a2a8_6816c7a3fa32.slice/docker-c4fde06bc7b55d4b0903e3f7d2a21980727f095fc03ba04bee9df95a5913d763.scope/cgroup.procs
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-besteffort.slice/kubepods-besteffort-podd7f73b62_b4bf_41dc_a50d_5bdf3b02d3e5.slice/cgroup.procs b/src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-besteffort.slice/kubepods-besteffort-podd7f73b62_b4bf_41dc_a50d_5bdf3b02d3e5.slice/cgroup.procs
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-besteffort.slice/kubepods-besteffort-podd7f73b62_b4bf_41dc_a50d_5bdf3b02d3e5.slice/docker-2e0a27214023acd90b19a25051a9e7a6dfb151064cb88a4171b00c7b9471ebb9.scope/cgroup.procs b/src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-besteffort.slice/kubepods-besteffort-podd7f73b62_b4bf_41dc_a50d_5bdf3b02d3e5.slice/docker-2e0a27214023acd90b19a25051a9e7a6dfb151064cb88a4171b00c7b9471ebb9.scope/cgroup.procs
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-besteffort.slice/kubepods-besteffort-podd7f73b62_b4bf_41dc_a50d_5bdf3b02d3e5.slice/docker-37d1600d21282ce1bc32ebbaf99bf2241f66ca096109a4cb5484e2aa305514b4.scope/cgroup.procs b/src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-besteffort.slice/kubepods-besteffort-podd7f73b62_b4bf_41dc_a50d_5bdf3b02d3e5.slice/docker-37d1600d21282ce1bc32ebbaf99bf2241f66ca096109a4cb5484e2aa305514b4.scope/cgroup.procs
deleted file mode 100644
index af7864ba2f0..00000000000
--- a/src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-besteffort.slice/kubepods-besteffort-podd7f73b62_b4bf_41dc_a50d_5bdf3b02d3e5.slice/docker-37d1600d21282ce1bc32ebbaf99bf2241f66ca096109a4cb5484e2aa305514b4.scope/cgroup.procs
+++ /dev/null
@@ -1,3 +0,0 @@
-123
-456
-789
diff --git a/src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-burstable.slice/cgroup.procs b/src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-burstable.slice/cgroup.procs
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-burstable.slice/kubepods-burstable-pod4db1ed35_32d4_4d59_a642_6bb212c9f748.slice/cgroup.procs b/src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-burstable.slice/kubepods-burstable-pod4db1ed35_32d4_4d59_a642_6bb212c9f748.slice/cgroup.procs
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-burstable.slice/kubepods-burstable-pod4db1ed35_32d4_4d59_a642_6bb212c9f748.slice/docker-43b2d6cee511f098634f3b19ffe099a8fedad9e55e8c540a0b115f19fd13f0d1.scope/cgroup.procs b/src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-burstable.slice/kubepods-burstable-pod4db1ed35_32d4_4d59_a642_6bb212c9f748.slice/docker-43b2d6cee511f098634f3b19ffe099a8fedad9e55e8c540a0b115f19fd13f0d1.scope/cgroup.procs
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-burstable.slice/kubepods-burstable-pod4db1ed35_32d4_4d59_a642_6bb212c9f748.slice/docker-b81071c8954ddfea7cb843250dd25ad40670da29960cd98fa2024efb8672c46f.scope/cgroup.procs b/src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-burstable.slice/kubepods-burstable-pod4db1ed35_32d4_4d59_a642_6bb212c9f748.slice/docker-b81071c8954ddfea7cb843250dd25ad40670da29960cd98fa2024efb8672c46f.scope/cgroup.procs
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-burstable.slice/kubepods-burstable-pod5a1d1140_a486_478c_afae_bbc975ff9c3b.slice/cgroup.procs b/src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-burstable.slice/kubepods-burstable-pod5a1d1140_a486_478c_afae_bbc975ff9c3b.slice/cgroup.procs
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-burstable.slice/kubepods-burstable-pod5a1d1140_a486_478c_afae_bbc975ff9c3b.slice/cri-containerd-2b41fe4bb7a365960f1e7ed6c09651252b29387b44c9e14ad17e3bc392e7c640.scope/cgroup.procs b/src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-burstable.slice/kubepods-burstable-pod5a1d1140_a486_478c_afae_bbc975ff9c3b.slice/cri-containerd-2b41fe4bb7a365960f1e7ed6c09651252b29387b44c9e14ad17e3bc392e7c640.scope/cgroup.procs
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-burstable.slice/kubepods-burstable-pod5a1d1140_a486_478c_afae_bbc975ff9c3b.slice/crio-2b41fe4bb7a365960f1e7ed6c09651252b29387b44c9e14ad17e3bc392e7c640.scope/cgroup.procs b/src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-burstable.slice/kubepods-burstable-pod5a1d1140_a486_478c_afae_bbc975ff9c3b.slice/crio-2b41fe4bb7a365960f1e7ed6c09651252b29387b44c9e14ad17e3bc392e7c640.scope/cgroup.procs
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-burstable.slice/kubepods-burstable-pod5a1d1140_a486_478c_afae_bbc975ff9c3b.slice/docker-2b41fe4bb7a365960f1e7ed6c09651252b29387b44c9e14ad17e3bc392e7c640.scope/cgroup.procs b/src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-burstable.slice/kubepods-burstable-pod5a1d1140_a486_478c_afae_bbc975ff9c3b.slice/docker-2b41fe4bb7a365960f1e7ed6c09651252b29387b44c9e14ad17e3bc392e7c640.scope/cgroup.procs
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-burstable.slice/kubepods-burstable-pod5a1d1140_a486_478c_afae_bbc975ff9c3b.slice/docker-4e33ed25bba45abc0dcba947ee29206174600e6a5d0e509547687e57f0588888.scope/cgroup.procs b/src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-burstable.slice/kubepods-burstable-pod5a1d1140_a486_478c_afae_bbc975ff9c3b.slice/docker-4e33ed25bba45abc0dcba947ee29206174600e6a5d0e509547687e57f0588888.scope/cgroup.procs
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-pod8dbc5577_d0e2_4706_8787_57d52c03ddf2.slice/cgroup.procs b/src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-pod8dbc5577_d0e2_4706_8787_57d52c03ddf2.slice/cgroup.procs
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-pod8dbc5577_d0e2_4706_8787_57d52c03ddf2.slice/docker-14011c7d92a9e513dfd69211da0413dbf319a5e45a02b354ba6e98e10272542d.scope/cgroup.procs b/src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-pod8dbc5577_d0e2_4706_8787_57d52c03ddf2.slice/docker-14011c7d92a9e513dfd69211da0413dbf319a5e45a02b354ba6e98e10272542d.scope/cgroup.procs
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-pod8dbc5577_d0e2_4706_8787_57d52c03ddf2.slice/docker-b9055cee13e1f37ecb63030593b27f4adc43cbd6629aa7781ffdf53fbaecfa46.scope/cgroup.procs b/src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/cpu,cpuacct/kubepods.slice/kubepods-pod8dbc5577_d0e2_4706_8787_57d52c03ddf2.slice/docker-b9055cee13e1f37ecb63030593b27f4adc43cbd6629aa7781ffdf53fbaecfa46.scope/cgroup.procs
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/kubepods.slice/kubepods-besteffort.slice/kubepods-besteffort-pod47810e8e_b9cb_4ac6_b12d_9e0577fa8237.slice/docker-28efca84cc7d707bdfbc5646144bba6c4417de2cf63f8583179603ce434d6dfe.scope/cgroup.procs b/src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/kubepods.slice/kubepods-besteffort.slice/kubepods-besteffort-pod47810e8e_b9cb_4ac6_b12d_9e0577fa8237.slice/docker-28efca84cc7d707bdfbc5646144bba6c4417de2cf63f8583179603ce434d6dfe.scope/cgroup.procs
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/kubepods.slice/kubepods-burstable.slice/kubepods-burstable-pod16de73f898f4460d96d28cf19ba8407f.slice/docker-23ac1540f833b029f76af6a513c4861a54bb9b77a6e3648b6f8392b1a09686ba.scope/cgroup.procs b/src/shared/metadata/testdata/sysfs4-cgroup-v1andv2/cgroup/kubepods.slice/kubepods-burstable.slice/kubepods-burstable-pod16de73f898f4460d96d28cf19ba8407f.slice/docker-23ac1540f833b029f76af6a513c4861a54bb9b77a6e3648b6f8392b1a09686ba.scope/cgroup.procs
deleted file mode 100644
index e69de29bb2d..00000000000

From fc4f5b2a2911bf3b3c6758d47e8f6872116156ac Mon Sep 17 00:00:00 2001
From: Dom Del Nano <ddelnano@gmail.com>
Date: Fri, 16 Aug 2024 14:55:30 +0000
Subject: [PATCH 5/6] Fix misspelling in test name leagcy -> legacy

Signed-off-by: Dom Del Nano <ddelnano@gmail.com>
---
 src/shared/metadata/cgroup_path_resolver_test.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/shared/metadata/cgroup_path_resolver_test.cc b/src/shared/metadata/cgroup_path_resolver_test.cc
index e512f76c75b..9e57b0aa0b0 100644
--- a/src/shared/metadata/cgroup_path_resolver_test.cc
+++ b/src/shared/metadata/cgroup_path_resolver_test.cc
@@ -316,7 +316,7 @@ TEST(LegacyCGroupPathResolverTest, StandardFormat) {
                              ContainerType::kContainerd));
 }
 
-TEST(LeagcyCGroupPathResolverTest, Cgroup2Format) {
+TEST(LegacyCGroupPathResolverTest, Cgroup2Format) {
   PX_SET_FOR_SCOPE(FLAGS_test_only_force_cgroup2_mode, true);
   ASSERT_OK_AND_ASSIGN(
       auto path_resolver,

From ea2a767879f89c643f04a581056d06181af1b3a9 Mon Sep 17 00:00:00 2001
From: Dom Del Nano <ddelnano@gmail.com>
Date: Fri, 16 Aug 2024 14:59:28 +0000
Subject: [PATCH 6/6] Fix linting

Signed-off-by: Dom Del Nano <ddelnano@gmail.com>
---
 src/shared/metadata/cgroup_path_resolver.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/shared/metadata/cgroup_path_resolver.cc b/src/shared/metadata/cgroup_path_resolver.cc
index dbe6702c450..bf71cb9a2b9 100644
--- a/src/shared/metadata/cgroup_path_resolver.cc
+++ b/src/shared/metadata/cgroup_path_resolver.cc
@@ -27,7 +27,8 @@
 #include "src/common/fs/fs_wrapper.h"
 #include "src/shared/metadata/cgroup_path_resolver.h"
 
-DEFINE_bool(test_only_force_cgroup2_mode, false, "Flag to force assume cgroup2 fs for testing purposes");
+DEFINE_bool(test_only_force_cgroup2_mode, false,
+            "Flag to force assume cgroup2 fs for testing purposes");
 
 namespace px {
 namespace md {