commit dcb434e824526b0242bd7490d9f0d247714e30da Author: Eric Yang Date: Tue Jan 23 18:55:19 2018 -0500 YARN-7797. Report nodemanager IP for docker container using host network. (Contributed by Eric Yang) 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..1eeaee3 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 @@ -58,6 +58,8 @@ import org.apache.hadoop.yarn.server.nodemanager.containermanager.runtime.ContainerRuntimeConstants; import org.apache.hadoop.yarn.server.nodemanager.containermanager.runtime.ContainerRuntimeContext; +import java.net.InetAddress; +import java.net.UnknownHostException; import java.nio.file.Files; import java.nio.file.Paths; import java.util.ArrayList; @@ -1020,6 +1022,24 @@ public void reapContainer(ContainerRuntimeContext ctx) } String ips = output.substring(0, index).trim(); String host = output.substring(index+1).trim(); + if (ips.equals("")) { + boolean useHostNetwork = container.getLaunchContext().getEnvironment() + .get("YARN_CONTAINER_RUNTIME_DOCKER_CONTAINER_NETWORK") + .equalsIgnoreCase("host"); + if (useHostNetwork) { + // Report back node manager IP in the event where docker + // inspect reports no IP address. This is for bridging a gap for + // docker environment to run with host network. + InetAddress address; + try { + address = InetAddress.getLocalHost(); + ips = address.getHostAddress(); + } catch (UnknownHostException e) { + LOG.error("Can not determine IP for container:" + + containerId); + } + } + } String[] ipAndHost = new String[2]; ipAndHost[0] = ips; ipAndHost[1] = host;