Repository: hadoop Updated Branches: refs/heads/branch-3.0 d3d32d358 -> 6362a9503
YARN-6799. Remove the duplicated code in CGroupsHandlerImp.java. (Contributed by Weiyuan via Yufei Gu) (cherry picked from commit 5ab21dfe9c8e14585db71e02bcb021a526507f98) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/6362a950 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/6362a950 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/6362a950 Branch: refs/heads/branch-3.0 Commit: 6362a9503d8677fceb8381445ed985bb674f4306 Parents: d3d32d3 Author: Yufei Gu <[email protected]> Authored: Sun Sep 10 23:17:48 2017 -0700 Committer: Yufei Gu <[email protected]> Committed: Fri Sep 15 09:51:50 2017 -0700 ---------------------------------------------------------------------- .../linux/resources/CGroupsHandlerImpl.java | 11 ----------- 1 file changed, 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/6362a950/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 ---------------------------------------------------------------------- diff --git a/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 b/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 index 44ae12b..f37dfd3 100644 --- a/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 +++ b/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 @@ -367,17 +367,6 @@ class CGroupsHandlerImpl implements CGroupsHandler { if (enableCGroupMount) { // We have a controller that needs to be mounted mountCGroupController(controller); - } else { - String controllerPath = getControllerPath(controller); - - if (controllerPath == null) { - throw new ResourceHandlerException( - String.format("Controller %s not mounted." - + " You either need to mount it with %s" - + " or mount cgroups before launching Yarn", - controller.getName(), YarnConfiguration. - NM_LINUX_CONTAINER_CGROUPS_MOUNT)); - } } // We are working with a pre-mounted contoller --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
