Merge pull request #2289 from HubSpot/handle_combined_cpu_cgroup

Handle combined `cpu,cpuacct` cgroup mountpoints

Author: WH77

SingularityExecutor/src/main/java/com/hubspot/singularity/executor/SingularityExecutorCgroupCfsChecker.java

@@ -66,11 +66,16 @@ private static Path getCpuCgroupDirectory(SingularityExecutorTask task)
       )
     );
     for (String cgroup : cgroups) {
-      if (cgroup.contains(":cpu:")) {
-        String[] segments = cgroup.split(":");
-        String cgroupPath = getBaseCgroupPath() + segments[segments.length - 1];
-        LOG.info("Will start watcher for directory {}", cgroupPath);
-        return Paths.get(cgroupPath);
+      String[] segments = cgroup.split(":", 3);
+      if (segments.length == 3) {
+        String[] subsystems = segments[1].split(",");
+        for (String subsystem : subsystems) {
+          if (subsystem.equals("cpu")) {
+            String cgroupPath = getBaseCgroupPath() + segments[2];
+            LOG.info("Will start watcher for directory {}", cgroupPath);
+            return Paths.get(cgroupPath);
+          }
+        }
       }
     }
     throw new RuntimeException(

SingularityExecutor/src/main/java/com/hubspot/singularity/executor/SingularityExecutorThreadChecker.java

@@ -394,21 +394,21 @@ private Optional<Integer> getNumThreadsFromCgroup(
     );
     if (Files.exists(procCgroupPath)) {
       for (String line : Files.readAllLines(procCgroupPath, Charsets.UTF_8)) {
-        final Matcher matcher = CGROUP_CPU_REGEX.matcher(line);
-        if (matcher.matches()) {
-          return Optional.of(
-            Files
-              .readAllLines(
-                Paths.get(
-                  String.format(
-                    configuration.getCgroupsMesosCpuTasksFormat(),
-                    matcher.group(1)
-                  )
-                ),
-                Charsets.UTF_8
-              )
-              .size()
-          );
+        String[] segments = line.split(":", 3);
+        if (segments.length == 3) {
+          String[] subsystems = segments[1].split(",");
+          String cgroup = segments[2];
+          for (String subsystem : subsystems) {
+            if (subsystem.equals("cpu")) {
+              String tasksPath = String.format(
+                configuration.getCgroupsMesosCpuTasksFormat(),
+                cgroup
+              );
+              return Optional.of(
+                Files.readAllLines(Paths.get(tasksPath), Charsets.UTF_8).size()
+              );
+            }
+          }
         }
       }
       LOG.warn("Unable to parse cgroup container from {}", procCgroupPath.toString());