Author: vinodkv
Date: Wed Jan 22 18:45:59 2014
New Revision: 1560467
URL: http://svn.apache.org/r1560467
Log:
YARN-321. Forwarding YARN-321 branch to latest trunk.
Modified:
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/CHANGES.txt
(contents, props changed)
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/java/
(props changed)
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer.java
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestHttpServer.java
Modified:
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1560467&r1=1560466&r2=1560467&view=diff
==============================================================================
---
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/CHANGES.txt
Wed Jan 22 18:45:59 2014
@@ -113,9 +113,6 @@ Trunk (Unreleased)
HADOOP-10177. Create CLI tools for managing keys. (Larry McCay via omalley)
- HADOOP-10143 replace WritableFactories's hashmap with ConcurrentHashMap
- (Liang Xie via stack)
-
BUG FIXES
HADOOP-9451. Fault single-layer config if node group topology is enabled.
@@ -424,6 +421,9 @@ Release 2.4.0 - UNRELEASED
HADOOP-9420. Add percentile or max metric for rpcQueueTime, processing
time.
(Liang Xie via wang)
+ HADOOP-10143 replace WritableFactories's hashmap with ConcurrentHashMap
+ (Liang Xie via stack)
+
OPTIMIZATIONS
HADOOP-9748. Reduce blocking on UGI.ensureInitialized (daryn)
@@ -533,6 +533,9 @@ Release 2.4.0 - UNRELEASED
HADOOP-10235. Hadoop tarball has 2 versions of stax-api JARs. (tucu)
+ HADOOP-10252. HttpServer can't start if hostname is not specified. (Jimmy
+ Xiang via atm)
+
Release 2.3.0 - UNRELEASED
INCOMPATIBLE CHANGES
Propchange:
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/CHANGES.txt
------------------------------------------------------------------------------
Merged
/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt:r1560144-1560466
Propchange:
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/java/
------------------------------------------------------------------------------
Merged
/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java:r1560144-1560466
Modified:
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer.java?rev=1560467&r1=1560466&r2=1560467&view=diff
==============================================================================
---
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer.java
(original)
+++
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer.java
Wed Jan 22 18:45:59 2014
@@ -455,7 +455,7 @@ public class HttpServer implements Filte
public HttpServer(String name, String bindAddress, int port,
boolean findPort, Configuration conf, AccessControlList adminsAcl,
Connector connector, String[] pathSpecs) throws IOException {
- this(new Builder().setName(name)
+ this(new Builder().setName(name).hostName(bindAddress)
.addEndpoint(URI.create("http://"; + bindAddress + ":" + port))
.setFindPort(findPort).setConf(conf).setACL(adminsAcl)
.setConnector(connector).setPathSpec(pathSpecs));
Modified:
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestHttpServer.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestHttpServer.java?rev=1560467&r1=1560466&r2=1560467&view=diff
==============================================================================
---
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestHttpServer.java
(original)
+++
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestHttpServer.java
Wed Jan 22 18:45:59 2014
@@ -524,6 +524,17 @@ public class TestHttpServer extends Http
Assert.assertFalse(HttpServer.isInstrumentationAccessAllowed(context,
request, response));
}
+ @Test
+ @SuppressWarnings("deprecation")
+ public void testOldConstructor() throws Exception {
+ HttpServer server = new HttpServer("test", "0.0.0.0", 0, false);
+ try {
+ server.start();
+ } finally {
+ server.stop();
+ }
+ }
+
@Test public void testBindAddress() throws Exception {
checkBindAddress("localhost", 0, false).stop();
// hang onto this one for a bit more testing
