Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

YARN-6433. Only accessible cgroup mount directories should be selected for a controller. (Miklos Szegedi via kasha) 

(cherry picked from commit 8a1d7480f7)
This commit is contained in:
Karthik Kambatla 2017-04-14 15:07:14 -07:00
parent c411adac32
commit 53da65ef8b
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/resources/CGroupsHandlerImpl.java
View File

@ -236,7 +236,12 @@ class CGroupsHandlerImpl implements CGroupsHandler {
Map<String, List<String>> entries) { Map<String, List<String>> entries) {
for (Map.Entry<String, List<String>> e : entries.entrySet()) { for (Map.Entry<String, List<String>> e : entries.entrySet()) {
if (e.getValue().contains(controller)) { if (e.getValue().contains(controller)) {
return e.getKey(); if (new File(e.getKey()).canRead()) {
return e.getKey();
} else {
LOG.warn(String.format(
"Skipping inaccessible cgroup mount point %s", e.getKey()));
}
} }
} }

5
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/resources/TestCGroupsHandlerImpl.java
View File

@ -252,6 +252,10 @@ public class TestCGroupsHandlerImpl {
String cpuMtabContent = String cpuMtabContent =
"none " + parentDir.getAbsolutePath() "none " + parentDir.getAbsolutePath()
+ "/cpu cgroup rw,relatime,cpu 0 0\n"; + "/cpu cgroup rw,relatime,cpu 0 0\n";
// Mark an empty directory called 'cp' cgroup. It is processed before 'cpu'
String cpuMtabContentMissing =
"none " + parentDir.getAbsolutePath()
+ "/cp cgroup rw,relatime,cpu 0 0\n";
String blkioMtabContent = String blkioMtabContent =
"none " + parentDir.getAbsolutePath() "none " + parentDir.getAbsolutePath()
+ "/blkio cgroup rw,relatime,blkio 0 0\n"; + "/blkio cgroup rw,relatime,blkio 0 0\n";
@ -264,6 +268,7 @@ public class TestCGroupsHandlerImpl {
} }
} }
FileWriter mtabWriter = new FileWriter(mockMtab.getAbsoluteFile()); FileWriter mtabWriter = new FileWriter(mockMtab.getAbsoluteFile());
mtabWriter.write(cpuMtabContentMissing);
mtabWriter.write(cpuMtabContent); mtabWriter.write(cpuMtabContent);
mtabWriter.write(blkioMtabContent); mtabWriter.write(blkioMtabContent);
mtabWriter.close(); mtabWriter.close();