Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

YARN-2119. DEFAULT_PROXY_ADDRESS should use DEFAULT_PROXY_PORT. (Anubhav Dhoot via kasha) 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1600487 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Karthik Kambatla 2014-06-04 20:18:49 +00:00
parent 45847e8df1
commit 33439defa1
3 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-yarn-project/CHANGES.txt
View File

@ -173,6 +173,9 @@ Release 2.5.0 - UNRELEASED
YARN-1550. NPE in FairSchedulerAppsBlock#render. (Anubhav Dhoot via kasha) YARN-1550. NPE in FairSchedulerAppsBlock#render. (Anubhav Dhoot via kasha)
YARN-2119. DEFAULT_PROXY_ADDRESS should use DEFAULT_PROXY_PORT.
(Anubhav Dhoot via kasha)
Release 2.4.1 - UNRELEASED Release 2.4.1 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

2
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
View File

@ -908,7 +908,7 @@ public class YarnConfiguration extends Configuration {
PROXY_PREFIX + "address"; PROXY_PREFIX + "address";
public static final int DEFAULT_PROXY_PORT = 9099; public static final int DEFAULT_PROXY_PORT = 9099;
public static final String DEFAULT_PROXY_ADDRESS = 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 * YARN Service Level Authorization

13
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/test/java/org/apache/hadoop/yarn/server/webproxy/TestWebAppProxyServer.java
View File

@ -25,9 +25,12 @@ import org.apache.hadoop.service.Service.STATE;
import org.apache.hadoop.yarn.conf.YarnConfiguration; import org.apache.hadoop.yarn.conf.YarnConfiguration;
import org.apache.hadoop.yarn.server.webproxy.WebAppProxyServer; import org.apache.hadoop.yarn.server.webproxy.WebAppProxyServer;
import org.junit.After; import org.junit.After;
import org.junit.Assert;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import java.net.InetSocketAddress;
public class TestWebAppProxyServer { public class TestWebAppProxyServer {
private WebAppProxyServer webAppProxy = null; private WebAppProxyServer webAppProxy = null;
private final String proxyAddress = "0.0.0.0:8888"; private final String proxyAddress = "0.0.0.0:8888";
@ -56,4 +59,14 @@ public class TestWebAppProxyServer {
} }
assertEquals(STATE.STARTED, webAppProxy.getServiceState()); 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());
}
} }