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

YARN-9010. Fix the incorrect trailing slash deletion in constructor method of CGroupsHandlerImpl. (Zhankun Tang via wangda) 

Change-Id: Iaecc66d57781cc10f19ead4647e47fc9556676da
This commit is contained in:
Wangda Tan 2018-11-29 14:56:07 -08:00
parent 0081b02e35
commit bad12031f6
2 changed files with 40 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
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

@ -87,9 +87,10 @@ class CGroupsHandlerImpl implements CGroupsHandler {
CGroupsHandlerImpl(Configuration conf, PrivilegedOperationExecutor CGroupsHandlerImpl(Configuration conf, PrivilegedOperationExecutor
privilegedOperationExecutor, String mtab) privilegedOperationExecutor, String mtab)
throws ResourceHandlerException { throws ResourceHandlerException {
// Remove leading and trialing slash(es)
this.cGroupPrefix = conf.get(YarnConfiguration. this.cGroupPrefix = conf.get(YarnConfiguration.
NM_LINUX_CONTAINER_CGROUPS_HIERARCHY, "/hadoop-yarn") NM_LINUX_CONTAINER_CGROUPS_HIERARCHY, "/hadoop-yarn")
.replaceAll("^/", "").replaceAll("$/", ""); .replaceAll("^/+", "").replaceAll("/+$", "");
this.enableCGroupMount = conf.getBoolean(YarnConfiguration. this.enableCGroupMount = conf.getBoolean(YarnConfiguration.
NM_LINUX_CONTAINER_CGROUPS_MOUNT, false); NM_LINUX_CONTAINER_CGROUPS_MOUNT, false);
this.cGroupMountPath = conf.get(YarnConfiguration. this.cGroupMountPath = conf.get(YarnConfiguration.

38
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

@ -598,4 +598,42 @@ public class TestCGroupsHandlerImpl {
FileUtils.deleteQuietly(cpu); FileUtils.deleteQuietly(cpu);
} }
} }
// Remove leading and trailing slashes
@Test
public void testCgroupsHierarchySetting() throws ResourceHandlerException {
YarnConfiguration conf = new YarnConfiguration();
conf.set(YarnConfiguration.NM_LINUX_CONTAINER_CGROUPS_MOUNT_PATH, tmpPath);
conf.set(YarnConfiguration.NM_LINUX_CONTAINER_CGROUPS_HIERARCHY,
"/hadoop-yarn");
CGroupsHandlerImpl cGroupsHandler = new CGroupsHandlerImpl(conf, null);
String expectedRelativePath = "hadoop-yarn/c1";
Assert.assertEquals(expectedRelativePath,
cGroupsHandler.getRelativePathForCGroup("c1"));
conf.set(YarnConfiguration.NM_LINUX_CONTAINER_CGROUPS_HIERARCHY,
"hadoop-yarn");
cGroupsHandler = new CGroupsHandlerImpl(conf, null);
Assert.assertEquals(expectedRelativePath,
cGroupsHandler.getRelativePathForCGroup("c1"));
conf.set(YarnConfiguration.NM_LINUX_CONTAINER_CGROUPS_HIERARCHY,
"hadoop-yarn/");
cGroupsHandler = new CGroupsHandlerImpl(conf, null);
Assert.assertEquals(expectedRelativePath,
cGroupsHandler.getRelativePathForCGroup("c1"));
conf.set(YarnConfiguration.NM_LINUX_CONTAINER_CGROUPS_HIERARCHY,
"//hadoop-yarn//");
cGroupsHandler = new CGroupsHandlerImpl(conf, null);
Assert.assertEquals(expectedRelativePath,
cGroupsHandler.getRelativePathForCGroup("c1"));
expectedRelativePath = "hadoop-yarn/root/c1";
conf.set(YarnConfiguration.NM_LINUX_CONTAINER_CGROUPS_HIERARCHY,
"//hadoop-yarn/root//");
cGroupsHandler = new CGroupsHandlerImpl(conf, null);
Assert.assertEquals(expectedRelativePath,
cGroupsHandler.getRelativePathForCGroup("c1"));
}
} }