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/trunk@1600484 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Karthik Kambatla 2014-06-04 20:12:47 +00:00
parent 02fcb6b6ba
commit 731f417f67
3 changed files with 17 additions and 1 deletions

View File

@ -188,6 +188,9 @@ Release 2.5.0 - UNRELEASED
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
INCOMPATIBLE CHANGES

View File

@ -908,7 +908,7 @@ public class YarnConfiguration extends Configuration {
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

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.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 class TestWebAppProxyServer {
}
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());
}
}