Repository: hadoop Updated Branches: refs/heads/YARN-6592 6ae4cc995 -> 8df7666fe (forced update)
YARN-7811. Fixed a bug in user defined docker network settings. (Contributed by Billie Rinaldi) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/f9dd5b61 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/f9dd5b61 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/f9dd5b61 Branch: refs/heads/YARN-6592 Commit: f9dd5b61f4ed0288cc01cb1a676df8c9cd69cdd9 Parents: 901d15a Author: Eric Yang <ey...@apache.org> Authored: Tue Jan 30 12:42:38 2018 -0500 Committer: Eric Yang <ey...@apache.org> Committed: Tue Jan 30 12:42:38 2018 -0500 ---------------------------------------------------------------------- .../containerlaunch/AbstractLauncher.java | 22 ++++++++++---------- .../service/provider/docker/DockerKeys.java | 7 ------- .../provider/docker/DockerProviderService.java | 2 +- 3 files changed, 12 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/f9dd5b61/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/containerlaunch/AbstractLauncher.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/containerlaunch/AbstractLauncher.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/containerlaunch/AbstractLauncher.java index e1e88cd..f497985 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/containerlaunch/AbstractLauncher.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/containerlaunch/AbstractLauncher.java @@ -39,8 +39,6 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; -import static org.apache.hadoop.yarn.service.provider.docker.DockerKeys.DEFAULT_DOCKER_NETWORK; - /** * Launcher of applications: base class */ @@ -60,9 +58,9 @@ public class AbstractLauncher { private final Map<String, ByteBuffer> serviceData = new HashMap<>(); protected boolean yarnDockerMode = false; protected String dockerImage; - protected String dockerNetwork = DEFAULT_DOCKER_NETWORK; + protected String dockerNetwork; protected String dockerHostname; - protected String runPrivilegedContainer; + protected boolean runPrivilegedContainer = false; private ServiceContext context; public AbstractLauncher(ServiceContext context) { @@ -145,10 +143,16 @@ public class AbstractLauncher { Map<String, String> env = containerLaunchContext.getEnvironment(); env.put("YARN_CONTAINER_RUNTIME_TYPE", "docker"); env.put("YARN_CONTAINER_RUNTIME_DOCKER_IMAGE", dockerImage); - env.put("YARN_CONTAINER_RUNTIME_DOCKER_CONTAINER_NETWORK", dockerNetwork); + if (ServiceUtils.isSet(dockerNetwork)) { + env.put("YARN_CONTAINER_RUNTIME_DOCKER_CONTAINER_NETWORK", + dockerNetwork); + } env.put("YARN_CONTAINER_RUNTIME_DOCKER_CONTAINER_HOSTNAME", dockerHostname); - env.put("YARN_CONTAINER_RUNTIME_DOCKER_RUN_PRIVILEGED_CONTAINER", runPrivilegedContainer); + if (runPrivilegedContainer) { + env.put("YARN_CONTAINER_RUNTIME_DOCKER_RUN_PRIVILEGED_CONTAINER", + "true"); + } StringBuilder sb = new StringBuilder(); for (Entry<String,String> mount : mountPaths.entrySet()) { if (sb.length() > 0) { @@ -238,11 +242,7 @@ public class AbstractLauncher { } public void setRunPrivilegedContainer(boolean runPrivilegedContainer) { - if (runPrivilegedContainer) { - this.runPrivilegedContainer = Boolean.toString(true); - } else { - this.runPrivilegedContainer = Boolean.toString(false); - } + this.runPrivilegedContainer = runPrivilegedContainer; } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/f9dd5b61/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/provider/docker/DockerKeys.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/provider/docker/DockerKeys.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/provider/docker/DockerKeys.java index f30c002..992a40c 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/provider/docker/DockerKeys.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/provider/docker/DockerKeys.java @@ -18,13 +18,6 @@ package org.apache.hadoop.yarn.service.provider.docker; public interface DockerKeys { - String PROVIDER_DOCKER = "docker"; String DOCKER_PREFIX = "docker."; - String DOCKER_IMAGE = DOCKER_PREFIX + "image"; String DOCKER_NETWORK = DOCKER_PREFIX + "network"; - String DOCKER_USE_PRIVILEGED = DOCKER_PREFIX + "usePrivileged"; - String DOCKER_START_COMMAND = DOCKER_PREFIX + "startCommand"; - - String DEFAULT_DOCKER_NETWORK = "bridge"; - Boolean DEFAULT_DOCKER_USE_PRIVILEGED = false; } http://git-wip-us.apache.org/repos/asf/hadoop/blob/f9dd5b61/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/provider/docker/DockerProviderService.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/provider/docker/DockerProviderService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/provider/docker/DockerProviderService.java index 0741947..6ac8de1 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/provider/docker/DockerProviderService.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/provider/docker/DockerProviderService.java @@ -37,7 +37,7 @@ public class DockerProviderService extends AbstractProviderService launcher.setYarnDockerMode(true); launcher.setDockerImage(compInstance.getCompSpec().getArtifact().getId()); launcher.setDockerNetwork(compInstance.getCompSpec().getConfiguration() - .getProperty(DOCKER_NETWORK, DEFAULT_DOCKER_NETWORK)); + .getProperty(DOCKER_NETWORK)); String domain = compInstance.getComponent().getScheduler().getConfig() .get(RegistryConstants.KEY_DNS_DOMAIN); String hostname; --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
