diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java index 18b18bc..4a534cf 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java @@ -908,7 +908,7 @@ PROXY_PREFIX + "address"; public static final int DEFAULT_PROXY_PORT = 9099; public static final String DEFAULT_PROXY_ADDRESS = - "0.0.0.0:" + DEFAULT_RM_PORT; + "0.0.0.0:" + DEFAULT_PROXY_PORT; /** * YARN Service Level Authorization diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/test/java/org/apache/hadoop/yarn/server/webproxy/TestWebAppProxyServer.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/test/java/org/apache/hadoop/yarn/server/webproxy/TestWebAppProxyServer.java index feed9fe..93479a9 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/test/java/org/apache/hadoop/yarn/server/webproxy/TestWebAppProxyServer.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/test/java/org/apache/hadoop/yarn/server/webproxy/TestWebAppProxyServer.java @@ -25,9 +25,12 @@ import org.apache.hadoop.yarn.conf.YarnConfiguration; import org.apache.hadoop.yarn.server.webproxy.WebAppProxyServer; import org.junit.After; +import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import java.net.InetSocketAddress; + public class TestWebAppProxyServer { private WebAppProxyServer webAppProxy = null; private final String proxyAddress = "0.0.0.0:8888"; @@ -56,4 +59,14 @@ public void testStart() { } assertEquals(STATE.STARTED, webAppProxy.getServiceState()); } + + @Test + public void testBindAddress() { + YarnConfiguration conf = new YarnConfiguration(); + + InetSocketAddress defaultBindAddress = WebAppProxyServer.getBindAddress(conf); + Assert.assertEquals("Web Proxy default bind address port is incorrect", + YarnConfiguration.DEFAULT_PROXY_PORT, + defaultBindAddress.getPort()); + } }