Repository: hadoop Updated Branches: refs/heads/trunk cc1085225 -> 2e5865606
YARN-7814. Remove automatic mounting of the cgroups root directory into Docker containers. Contributed by Shane Kumpf. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/2e586560 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/2e586560 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/2e586560 Branch: refs/heads/trunk Commit: 2e5865606b7701ee79d0d297238ab58a07a9f61f Parents: cc10852 Author: Miklos Szegedi <szege...@apache.org> Authored: Thu Jan 25 16:32:01 2018 -0800 Committer: Miklos Szegedi <szege...@apache.org> Committed: Thu Jan 25 17:37:23 2018 -0800 ---------------------------------------------------------------------- .../runtime/DockerLinuxContainerRuntime.java | 7 ------- .../runtime/TestDockerContainerRuntime.java | 19 ------------------- 2 files changed, 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/2e586560/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/runtime/DockerLinuxContainerRuntime.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/runtime/DockerLinuxContainerRuntime.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/runtime/DockerLinuxContainerRuntime.java index f54323c..2868dea 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/runtime/DockerLinuxContainerRuntime.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/runtime/DockerLinuxContainerRuntime.java @@ -230,7 +230,6 @@ public class DockerLinuxContainerRuntime implements LinuxContainerRuntime { private PrivilegedOperationExecutor privilegedOperationExecutor; private Set<String> allowedNetworks = new HashSet<>(); private String defaultNetwork; - private String cgroupsRootDirectory; private CGroupsHandler cGroupsHandler; private AccessControlList privilegedContainersAcl; private boolean enableUserReMapping; @@ -290,7 +289,6 @@ public class DockerLinuxContainerRuntime implements LinuxContainerRuntime { LOG.info("cGroupsHandler is null - cgroups not in use."); } else { this.cGroupsHandler = cGroupsHandler; - this.cgroupsRootDirectory = cGroupsHandler.getCGroupMountPath(); } } @@ -796,11 +794,6 @@ public class DockerLinuxContainerRuntime implements LinuxContainerRuntime { setHostname(runCommand, containerIdStr, hostname); runCommand.setCapabilities(capabilities); - if(cgroupsRootDirectory != null) { - runCommand.addReadOnlyMountLocation(cgroupsRootDirectory, - cgroupsRootDirectory, false); - } - List<String> allDirs = new ArrayList<>(containerLocalDirs); allDirs.addAll(filecacheDirs); allDirs.add(containerWorkDir.toString()); http://git-wip-us.apache.org/repos/asf/hadoop/blob/2e586560/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/runtime/TestDockerContainerRuntime.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/runtime/TestDockerContainerRuntime.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/runtime/TestDockerContainerRuntime.java index a825828..48a96e1 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/runtime/TestDockerContainerRuntime.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/runtime/TestDockerContainerRuntime.java @@ -37,7 +37,6 @@ import org.apache.hadoop.yarn.server.nodemanager.containermanager.linux.privileg import org.apache.hadoop.yarn.server.nodemanager.containermanager.linux.privileged.PrivilegedOperationException; import org.apache.hadoop.yarn.server.nodemanager.containermanager.linux.privileged.PrivilegedOperationExecutor; import org.apache.hadoop.yarn.server.nodemanager.containermanager.linux.resources.CGroupsHandler; -import org.apache.hadoop.yarn.server.nodemanager.containermanager.linux.resources.ResourceHandlerModule; import org.apache.hadoop.yarn.server.nodemanager.containermanager.linux.runtime.docker.DockerCommandExecutor; import org.apache.hadoop.yarn.server.nodemanager.containermanager.linux.runtime.docker.DockerKillCommand; import org.apache.hadoop.yarn.server.nodemanager.containermanager.linux.runtime.docker.DockerRmCommand; @@ -332,24 +331,6 @@ public class TestDockerContainerRuntime { return expectedCapabilitiesString.toString(); } - private String getExpectedCGroupsMountString() { - CGroupsHandler cgroupsHandler = ResourceHandlerModule.getCGroupsHandler(); - if(cgroupsHandler == null) { - return ""; - } - - String cgroupMountPath = cgroupsHandler.getCGroupMountPath(); - boolean cGroupsMountExists = new File( - cgroupMountPath).exists(); - - if(cGroupsMountExists) { - return "-v " + cgroupMountPath - + ":" + cgroupMountPath + ":ro "; - } else { - return ""; - } - } - @Test public void testDockerContainerLaunch() throws ContainerExecutionException, PrivilegedOperationException, --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
