cpuset controller required for cgroups v1

Author: jerboaa

src/hotspot/os/linux/cgroupSubsystem_linux.cpp

@@ -335,7 +335,6 @@ bool CgroupSubsystemFactory::determine_type(CgroupInfo* cg_infos,
         cg_infos[MEMORY_IDX]._hierarchy_id = hierarchy_id;
         cg_infos[MEMORY_IDX]._enabled = (enabled == 1);
       } else if (strcmp(name, "cpuset") == 0) {
-        log_debug(os, container)("Detected optional cpuset controller entry in %s", controllers_file);
         cg_infos[CPUSET_IDX]._name = os::strdup(name);
         cg_infos[CPUSET_IDX]._hierarchy_id = hierarchy_id;
         cg_infos[CPUSET_IDX]._enabled = (enabled == 1);
@@ -355,8 +354,8 @@ bool CgroupSubsystemFactory::determine_type(CgroupInfo* cg_infos,
       }
     }
     for (int i = 0; i < CG_INFO_LENGTH; i++) {
-      // pids and cpuset controllers are optional. All other controllers are required
-      if (i != PIDS_IDX && i != CPUSET_IDX) {
+      // pid controller is optional. All other controllers are required
+      if (i != PIDS_IDX) {
         all_required_controllers_enabled = all_required_controllers_enabled && cg_infos[i]._enabled;
       }
       if (log_is_enabled(Debug, os, container) && !cg_infos[i]._enabled) {

test/hotspot/jtreg/containers/cgroup/CgroupSubsystemFactory.java

@@ -551,7 +551,7 @@ public void testCgroupv1CpusetMissingFromProcCgroups(WhiteBox wb) {
         String procSelfCgroup = cgroupV1SelfCgroupNoCpuset.toString();
         String procSelfMountinfo = cgroupv1MntInfoNonZeroHierarchyNoCpuset.toString();
         int retval = wb.validateCgroup(false, procCgroups, procSelfCgroup, procSelfMountinfo);
-        Asserts.assertEQ(INVALID_CGROUPS_V1, retval, "Required cpuset controller missing in /proc/cgroups. Invalid.");
+        Asserts.assertEQ(INVALID_CGROUPS_GENERIC, retval, "Required cpuset controller missing in /proc/cgroups. Invalid.");
         Asserts.assertFalse(isValidCgroup(retval));
         System.out.println("testCgroupv1CpusetMissingFromProcCgroups PASSED!");
     }