Author: jing9 Date: Thu Jan 23 19:22:43 2014 New Revision: 1560794 URL: http://svn.apache.org/r1560794 Log: Merging r1559902 through r1560793 from trunk.
Modified: hadoop/common/branches/HDFS-5698/hadoop-common-project/hadoop-common/CHANGES.txt (contents, props changed) hadoop/common/branches/HDFS-5698/hadoop-common-project/hadoop-common/src/main/docs/ (props changed) hadoop/common/branches/HDFS-5698/hadoop-common-project/hadoop-common/src/main/java/ (props changed) hadoop/common/branches/HDFS-5698/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer.java hadoop/common/branches/HDFS-5698/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/WritableFactories.java hadoop/common/branches/HDFS-5698/hadoop-common-project/hadoop-common/src/test/core/ (props changed) hadoop/common/branches/HDFS-5698/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestHttpServer.java Modified: hadoop/common/branches/HDFS-5698/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-5698/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1560794&r1=1560793&r2=1560794&view=diff ============================================================================== --- hadoop/common/branches/HDFS-5698/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/branches/HDFS-5698/hadoop-common-project/hadoop-common/CHANGES.txt Thu Jan 23 19:22:43 2014 @@ -421,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) @@ -530,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/HDFS-5698/hadoop-common-project/hadoop-common/CHANGES.txt ------------------------------------------------------------------------------ Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt:r1559902-1560793 Propchange: hadoop/common/branches/HDFS-5698/hadoop-common-project/hadoop-common/src/main/docs/ ------------------------------------------------------------------------------ Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/docs:r1559902-1560793 Propchange: hadoop/common/branches/HDFS-5698/hadoop-common-project/hadoop-common/src/main/java/ ------------------------------------------------------------------------------ Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java:r1559902-1560793 Modified: hadoop/common/branches/HDFS-5698/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-5698/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer.java?rev=1560794&r1=1560793&r2=1560794&view=diff ============================================================================== --- hadoop/common/branches/HDFS-5698/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer.java (original) +++ hadoop/common/branches/HDFS-5698/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer.java Thu Jan 23 19:22:43 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/HDFS-5698/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/WritableFactories.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-5698/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/WritableFactories.java?rev=1560794&r1=1560793&r2=1560794&view=diff ============================================================================== --- hadoop/common/branches/HDFS-5698/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/WritableFactories.java (original) +++ hadoop/common/branches/HDFS-5698/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/WritableFactories.java Thu Jan 23 19:22:43 2014 @@ -22,25 +22,26 @@ import org.apache.hadoop.classification. import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.conf.*; import org.apache.hadoop.util.ReflectionUtils; -import java.util.HashMap; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; /** Factories for non-public writables. Defining a factory permits {@link * ObjectWritable} to be able to construct instances of non-public classes. */ @InterfaceAudience.Public @InterfaceStability.Stable public class WritableFactories { - private static final HashMap<Class, WritableFactory> CLASS_TO_FACTORY = - new HashMap<Class, WritableFactory>(); + private static final Map<Class, WritableFactory> CLASS_TO_FACTORY = + new ConcurrentHashMap<Class, WritableFactory>(); private WritableFactories() {} // singleton /** Define a factory for a class. */ - public static synchronized void setFactory(Class c, WritableFactory factory) { + public static void setFactory(Class c, WritableFactory factory) { CLASS_TO_FACTORY.put(c, factory); } /** Define a factory for a class. */ - public static synchronized WritableFactory getFactory(Class c) { + public static WritableFactory getFactory(Class c) { return CLASS_TO_FACTORY.get(c); } Propchange: hadoop/common/branches/HDFS-5698/hadoop-common-project/hadoop-common/src/test/core/ ------------------------------------------------------------------------------ Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/core:r1559902-1560793 Modified: hadoop/common/branches/HDFS-5698/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestHttpServer.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-5698/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestHttpServer.java?rev=1560794&r1=1560793&r2=1560794&view=diff ============================================================================== --- hadoop/common/branches/HDFS-5698/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestHttpServer.java (original) +++ hadoop/common/branches/HDFS-5698/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestHttpServer.java Thu Jan 23 19:22:43 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