Author: suresh Date: Fri Feb 15 10:57:34 2013 New Revision: 1446507 URL: http://svn.apache.org/r1446507 Log: Merge trunk to HDFS-2802 branch
Removed: hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/test/ddl/buffer.jr hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/test/ddl/int.jr hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/test/ddl/string.jr hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/test/ddl/test.jr hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/record/FromCpp.java hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/record/RecordBench.java hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/record/TestBuffer.java hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/record/TestRecordIO.java hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/record/TestRecordVersioning.java hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/record/ToCpp.java Modified: hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/CHANGES.txt (contents, props changed) hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/dev-support/findbugsExcludeFile.xml hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/pom.xml hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/main/docs/ (props changed) hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/main/java/ (props changed) hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/AbstractMapWritable.java hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/SortedMapWritable.java hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/ProtobufRpcEngine.java hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/GenericOptionsParser.java hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/site/apt/CommandsManual.apt.vm hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/test/core/ (props changed) hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/TestSortedMapWritable.java Modified: hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1446507&r1=1446506&r2=1446507&view=diff ============================================================================== --- hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/CHANGES.txt Fri Feb 15 10:57:34 2013 @@ -146,11 +146,10 @@ Trunk (Unreleased) HADOOP-9162. Add utility to check native library availability. (Binglin Chang via suresh) - HADOOP-8924. Add maven plugin alternative to shell script to save - package-info.java. (Chris Nauroth via suresh) - HADOOP-9277. Improve javadoc for FileContext. (Andrew Wang via suresh) + HADOOP-9218 Document the Rpc-wrappers used internally (sanjay Radia) + BUG FIXES HADOOP-8419. Fixed GzipCode NPE reset for IBM JDK. (Yu Li via eyang) @@ -321,9 +320,6 @@ Trunk (Unreleased) HADOOP-9202. test-patch.sh fails during mvn eclipse:eclipse if patch adds a new module to the build (Chris Nauroth via bobby) - HADOOP-9245. mvn clean without running mvn install before fails. - (Karthik Kambatla via suresh) - HADOOP-9249. hadoop-maven-plugins version-info goal causes build failure when running with Clover. (Chris Nauroth via suresh) @@ -336,9 +332,6 @@ Trunk (Unreleased) HADOOP-8589 ViewFs tests fail when tests and home dirs are nested (sanjay Radia) - HADOOP-9246 Execution phase for hadoop-maven-plugin should be - process-resources (Karthik Kambatla and Chris Nauroth via jlowe) - HADOOP-9190. packaging docs is broken. (Andy Isaacson via atm) Release 2.0.4-beta - UNRELEASED @@ -354,12 +347,32 @@ Release 2.0.4-beta - UNRELEASED HADOOP-9253. Capture ulimit info in the logs at service start time. (Arpit Gupta via suresh) + HADOOP-8924. Add maven plugin alternative to shell script to save + package-info.java. (Chris Nauroth via suresh) + + HADOOP-9117. replace protoc ant plugin exec with a maven plugin. (tucu) + OPTIMIZATIONS BUG FIXES HADOOP-9294. GetGroupsTestBase fails on Windows. (Chris Nauroth via suresh) + HADOOP-9305. Add support for running the Hadoop client on 64-bit AIX. (atm) + + HADOOP-9245. mvn clean without running mvn install before fails. + (Karthik Kambatla via suresh) + + HADOOP-9246 Execution phase for hadoop-maven-plugin should be + process-resources (Karthik Kambatla and Chris Nauroth via jlowe) + + HADOOP-9297. remove old record IO generation and tests. (tucu) + + HADOOP-9154. SortedMapWritable#putAll() doesn't add key/value classes to + the map. (Karthik Kambatla via tomwhite) + + HADOOP-9304. remove addition of avro genreated-sources dirs to build. (tucu) + Release 2.0.3-alpha - 2013-02-06 INCOMPATIBLE CHANGES @@ -1341,6 +1354,12 @@ Release 0.23.7 - UNRELEASED BUG FIXES + HADOOP-9302. HDFS docs not linked from top level (Andy Isaacson via + tgraves) + + HADOOP-9303. command manual dfsadmin missing entry for restoreFailedStorage + option (Andy Isaacson via tgraves) + Release 0.23.6 - UNRELEASED INCOMPATIBLE CHANGES Propchange: hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/CHANGES.txt ------------------------------------------------------------------------------ Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt:r1444435-1446504 Modified: hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/dev-support/findbugsExcludeFile.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/dev-support/findbugsExcludeFile.xml?rev=1446507&r1=1446506&r2=1446507&view=diff ============================================================================== --- hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/dev-support/findbugsExcludeFile.xml (original) +++ hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/dev-support/findbugsExcludeFile.xml Fri Feb 15 10:57:34 2013 @@ -286,6 +286,10 @@ <!-- protobuf generated code --> <Class name="~org\.apache\.hadoop\.security\.proto\.SecurityProtos.*"/> </Match> + <Match> + <!-- protobuf generated code --> + <Class name="~org\.apache\.hadoop\.ipc\.protobuf\.TestProtos.*"/> + </Match> <!-- Manually checked, misses child thread manually syncing on parent's intrinsic lock. Modified: hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/pom.xml?rev=1446507&r1=1446506&r2=1446507&view=diff ============================================================================== --- hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/pom.xml (original) +++ hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/pom.xml Fri Feb 15 10:57:34 2013 @@ -293,6 +293,51 @@ </source> </configuration> </execution> + <execution> + <id>compile-protoc</id> + <phase>generate-sources</phase> + <goals> + <goal>protoc</goal> + </goals> + <configuration> + <imports> + <param>${basedir}/src/main/proto</param> + </imports> + <source> + <directory>${basedir}/src/main/proto</directory> + <includes> + <include>HAServiceProtocol.proto</include> + <include>IpcConnectionContext.proto</include> + <include>ProtocolInfo.proto</include> + <include>RpcHeader.proto</include> + <include>ZKFCProtocol.proto</include> + <include>ProtobufRpcEngine.proto</include> + <include>Security.proto</include> + </includes> + </source> + <output>${project.build.directory}/generated-sources/java</output> + </configuration> + </execution> + <execution> + <id>compile-test-protoc</id> + <phase>generate-test-sources</phase> + <goals> + <goal>protoc</goal> + </goals> + <configuration> + <imports> + <param>${basedir}/src/test/proto</param> + </imports> + <source> + <directory>${basedir}/src/test/proto</directory> + <includes> + <include>test.proto</include> + <include>test_rpc_service.proto</include> + </includes> + </source> + <output>${project.build.directory}/generated-test-sources/java</output> + </configuration> + </execution> </executions> </plugin> <plugin> @@ -332,39 +377,6 @@ <artifactId>maven-antrun-plugin</artifactId> <executions> <execution> - <id>create-protobuf-generated-sources-directory</id> - <phase>initialize</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <target> - <mkdir dir="target/generated-sources/java" /> - <mkdir dir="target/generated-test-sources/java" /> - </target> - </configuration> - </execution> - <execution> - <id>generate-test-sources</id> - <phase>generate-test-sources</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <target> - - <mkdir dir="${project.build.directory}/generated-test-sources/java"/> - - <taskdef name="recordcc" classname="org.apache.hadoop.record.compiler.ant.RccTask"> - <classpath refid="maven.compile.classpath"/> - </taskdef> - <recordcc destdir="${project.build.directory}/generated-test-sources/java"> - <fileset dir="${basedir}/src/test/ddl" includes="**/*.jr"/> - </recordcc> - </target> - </configuration> - </execution> - <execution> <id>create-log-dir</id> <phase>process-test-resources</phase> <goals> @@ -418,79 +430,6 @@ </executions> </plugin> <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>exec-maven-plugin</artifactId> - <executions> - <execution> - <id>compile-proto</id> - <phase>generate-sources</phase> - <goals> - <goal>exec</goal> - </goals> - <configuration> - <executable>protoc</executable> - <arguments> - <argument>-Isrc/main/proto/</argument> - <argument>--java_out=target/generated-sources/java</argument> - <argument>src/main/proto/HAServiceProtocol.proto</argument> - <argument>src/main/proto/IpcConnectionContext.proto</argument> - <argument>src/main/proto/ProtocolInfo.proto</argument> - <argument>src/main/proto/RpcHeader.proto</argument> - <argument>src/main/proto/ZKFCProtocol.proto</argument> - <argument>src/main/proto/ProtobufRpcEngine.proto</argument> - <argument>src/main/proto/Security.proto</argument> - </arguments> - </configuration> - </execution> - <execution> - <id>compile-test-proto</id> - <phase>generate-test-sources</phase> - <goals> - <goal>exec</goal> - </goals> - <configuration> - <executable>protoc</executable> - <arguments> - <argument>-Isrc/test/proto/</argument> - <argument>--java_out=target/generated-test-sources/java</argument> - <argument>src/test/proto/test.proto</argument> - <argument>src/test/proto/test_rpc_service.proto</argument> - </arguments> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <executions> - <execution> - <id>add-source</id> - <phase>generate-sources</phase> - <goals> - <goal>add-source</goal> - </goals> - <configuration> - <sources> - <source>${project.build.directory}/generated-sources/java</source> - </sources> - </configuration> - </execution> - <execution> - <id>add-test-source</id> - <phase>generate-sources</phase> - <goals> - <goal>add-test-source</goal> - </goals> - <configuration> - <sources> - <source>${project.build.directory}/generated-test-sources/java</source> - </sources> - </configuration> - </execution> - </executions> - </plugin> - <plugin> <groupId>org.apache.rat</groupId> <artifactId>apache-rat-plugin</artifactId> <configuration> Propchange: hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/main/docs/ ------------------------------------------------------------------------------ Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/docs:r1444435-1446504 Propchange: hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/main/java/ ------------------------------------------------------------------------------ Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java:r1444435-1446504 Modified: hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/AbstractMapWritable.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/AbstractMapWritable.java?rev=1446507&r1=1446506&r2=1446507&view=diff ============================================================================== --- hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/AbstractMapWritable.java (original) +++ hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/AbstractMapWritable.java Fri Feb 15 10:57:34 2013 @@ -29,6 +29,8 @@ import org.apache.hadoop.classification. import org.apache.hadoop.conf.Configurable; import org.apache.hadoop.conf.Configuration; +import com.google.common.annotations.VisibleForTesting; + /** * Abstract base class for MapWritable and SortedMapWritable * @@ -45,10 +47,12 @@ public abstract class AbstractMapWritabl private AtomicReference<Configuration> conf; /* Class to id mappings */ - private Map<Class, Byte> classToIdMap = new ConcurrentHashMap<Class, Byte>(); + @VisibleForTesting + Map<Class, Byte> classToIdMap = new ConcurrentHashMap<Class, Byte>(); /* Id to Class mappings */ - private Map<Byte, Class> idToClassMap = new ConcurrentHashMap<Byte, Class>(); + @VisibleForTesting + Map<Byte, Class> idToClassMap = new ConcurrentHashMap<Byte, Class>(); /* The number of new classes (those not established by the constructor) */ private volatile byte newClasses = 0; Modified: hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/SortedMapWritable.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/SortedMapWritable.java?rev=1446507&r1=1446506&r2=1446507&view=diff ============================================================================== --- hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/SortedMapWritable.java (original) +++ hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/SortedMapWritable.java Fri Feb 15 10:57:34 2013 @@ -141,7 +141,7 @@ public class SortedMapWritable extends A for (Map.Entry<? extends WritableComparable, ? extends Writable> e: t.entrySet()) { - instance.put(e.getKey(), e.getValue()); + put(e.getKey(), e.getValue()); } } Modified: hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/ProtobufRpcEngine.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/ProtobufRpcEngine.java?rev=1446507&r1=1446506&r2=1446507&view=diff ============================================================================== --- hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/ProtobufRpcEngine.java (original) +++ hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/ProtobufRpcEngine.java Fri Feb 15 10:57:34 2013 @@ -62,7 +62,7 @@ public class ProtobufRpcEngine implement static { // Register the rpcRequest deserializer for WritableRpcEngine org.apache.hadoop.ipc.Server.registerProtocolEngine( - RPC.RpcKind.RPC_PROTOCOL_BUFFER, RpcRequestWritable.class, + RPC.RpcKind.RPC_PROTOCOL_BUFFER, RpcRequestWrapper.class, new Server.ProtoBufRpcInvoker()); } @@ -122,7 +122,7 @@ public class ProtobufRpcEngine implement public Invoker(Class<?> protocol, Client.ConnectionId connId, Configuration conf, SocketFactory factory) { this.remoteId = connId; - this.client = CLIENTS.getClient(conf, factory, RpcResponseWritable.class); + this.client = CLIENTS.getClient(conf, factory, RpcResponseWrapper.class); this.protocolName = RPC.getProtocolName(protocol); this.clientProtocolVersion = RPC .getProtocolVersion(protocol); @@ -191,7 +191,7 @@ public class ProtobufRpcEngine implement } RequestProto rpcRequest = constructRpcRequest(method, args); - RpcResponseWritable val = null; + RpcResponseWrapper val = null; if (LOG.isTraceEnabled()) { LOG.trace(Thread.currentThread().getId() + ": Call -> " + @@ -199,8 +199,8 @@ public class ProtobufRpcEngine implement " {" + TextFormat.shortDebugString((Message) args[1]) + "}"); } try { - val = (RpcResponseWritable) client.call(RPC.RpcKind.RPC_PROTOCOL_BUFFER, - new RpcRequestWritable(rpcRequest), remoteId); + val = (RpcResponseWrapper) client.call(RPC.RpcKind.RPC_PROTOCOL_BUFFER, + new RpcRequestWrapper(rpcRequest), remoteId); } catch (Throwable e) { if (LOG.isTraceEnabled()) { @@ -268,16 +268,20 @@ public class ProtobufRpcEngine implement } /** - * Writable Wrapper for Protocol Buffer Requests + * Wrapper for Protocol Buffer Requests + * + * Note while this wrapper is writable, the request on the wire is in + * Protobuf. Several methods on {@link org.apache.hadoop.ipc.Server and RPC} + * use type Writable as a wrapper to work across multiple RpcEngine kinds. */ - private static class RpcRequestWritable implements Writable { + private static class RpcRequestWrapper implements Writable { RequestProto message; @SuppressWarnings("unused") - public RpcRequestWritable() { + public RpcRequestWrapper() { } - RpcRequestWritable(RequestProto message) { + RpcRequestWrapper(RequestProto message) { this.message = message; } @@ -303,16 +307,20 @@ public class ProtobufRpcEngine implement } /** - * Writable Wrapper for Protocol Buffer Responses + * Wrapper for Protocol Buffer Responses + * + * Note while this wrapper is writable, the request on the wire is in + * Protobuf. Several methods on {@link org.apache.hadoop.ipc.Server and RPC} + * use type Writable as a wrapper to work across multiple RpcEngine kinds. */ - private static class RpcResponseWritable implements Writable { + private static class RpcResponseWrapper implements Writable { byte[] responseMessage; @SuppressWarnings("unused") - public RpcResponseWritable() { + public RpcResponseWrapper() { } - public RpcResponseWritable(Message message) { + public RpcResponseWrapper(Message message) { this.responseMessage = message.toByteArray(); } @@ -336,7 +344,7 @@ public class ProtobufRpcEngine implement @InterfaceStability.Unstable static Client getClient(Configuration conf) { return CLIENTS.getClient(conf, SocketFactory.getDefault(), - RpcResponseWritable.class); + RpcResponseWrapper.class); } @@ -425,7 +433,7 @@ public class ProtobufRpcEngine implement */ public Writable call(RPC.Server server, String connectionProtocolName, Writable writableRequest, long receiveTime) throws Exception { - RpcRequestWritable request = (RpcRequestWritable) writableRequest; + RpcRequestWrapper request = (RpcRequestWrapper) writableRequest; RequestProto rpcRequest = request.message; String methodName = rpcRequest.getMethodName(); @@ -487,7 +495,7 @@ public class ProtobufRpcEngine implement } catch (Exception e) { throw e; } - return new RpcResponseWritable(result); + return new RpcResponseWrapper(result); } } } Modified: hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java?rev=1446507&r1=1446506&r2=1446507&view=diff ============================================================================== --- hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java (original) +++ hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java Fri Feb 15 10:57:34 2013 @@ -316,7 +316,8 @@ public class UserGroupInformation { return is64Bit ? "com.ibm.security.auth.module.Win64LoginModule" : "com.ibm.security.auth.module.NTLoginModule"; } else if (aix) { - return "com.ibm.security.auth.module.AIXLoginModule"; + return is64Bit ? "com.ibm.security.auth.module.AIX64LoginModule" + : "com.ibm.security.auth.module.AIXLoginModule"; } else { return "com.ibm.security.auth.module.LinuxLoginModule"; } @@ -331,24 +332,24 @@ public class UserGroupInformation { private static Class<? extends Principal> getOsPrincipalClass() { ClassLoader cl = ClassLoader.getSystemClassLoader(); try { + String principalClass = null; if (ibmJava) { - if (windows) { - return (Class<? extends Principal>) (is64Bit - ? cl.loadClass("com.ibm.security.auth.UsernamePrincipal") - : cl.loadClass("com.ibm.security.auth.NTUserPrincipal")); - } else if (aix) { - return (Class<? extends Principal>) - cl.loadClass("com.ibm.security.auth.AIXPrincipal"); + if (is64Bit) { + principalClass = "com.ibm.security.auth.UsernamePrincipal"; } else { - return (Class<? extends Principal>) (is64Bit - ? cl.loadClass("com.ibm.security.auth.UsernamePrincipal") - : cl.loadClass("com.ibm.security.auth.LinuxPrincipal")); + if (windows) { + principalClass = "com.ibm.security.auth.NTUserPrincipal"; + } else if (aix) { + principalClass = "com.ibm.security.auth.AIXPrincipal"; + } else { + principalClass = "com.ibm.security.auth.LinuxPrincipal"; + } } } else { - return (Class<? extends Principal>) (windows - ? cl.loadClass("com.sun.security.auth.NTUserPrincipal") - : cl.loadClass("com.sun.security.auth.UnixPrincipal")); + principalClass = windows ? "com.sun.security.auth.NTUserPrincipal" + : "com.sun.security.auth.UnixPrincipal"; } + return (Class<? extends Principal>) cl.loadClass(principalClass); } catch (ClassNotFoundException e) { LOG.error("Unable to find JAAS classes:" + e.getMessage()); } Modified: hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/GenericOptionsParser.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/GenericOptionsParser.java?rev=1446507&r1=1446506&r2=1446507&view=diff ============================================================================== --- hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/GenericOptionsParser.java (original) +++ hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/GenericOptionsParser.java Fri Feb 15 10:57:34 2013 @@ -268,7 +268,12 @@ public class GenericOptionsParser { } if (line.hasOption("jt")) { - conf.set("mapred.job.tracker", line.getOptionValue("jt"), + String optionValue = line.getOptionValue("jt"); + if (optionValue.equalsIgnoreCase("local")) { + conf.set("mapreduce.framework.name", optionValue); + } + + conf.set("yarn.resourcemanager.address", optionValue, "from -jt command line option"); } if (line.hasOption("conf")) { Modified: hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/site/apt/CommandsManual.apt.vm URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/site/apt/CommandsManual.apt.vm?rev=1446507&r1=1446506&r2=1446507&view=diff ============================================================================== --- hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/site/apt/CommandsManual.apt.vm (original) +++ hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/site/apt/CommandsManual.apt.vm Fri Feb 15 10:57:34 2013 @@ -350,10 +350,11 @@ Administration Commands Runs a HDFS dfsadmin client. - Usage: <<<hadoop dfsadmin [GENERIC_OPTIONS] [-report] [-safemode enter | leave | get | wait] [-refreshNodes] [-finalizeUpgrade] [-upgradeProgress status | details | force] [-metasave filename] [-setQuota <quota> <dirname>...<dirname>] [-clrQuota <dirname>...<dirname>] [-help [cmd]]>>> + Usage: <<<hadoop dfsadmin [GENERIC_OPTIONS] [-report] [-safemode enter | leave | get | wait] [-refreshNodes] [-finalizeUpgrade] [-upgradeProgress status | details | force] [-metasave filename] [-setQuota <quota> <dirname>...<dirname>] [-clrQuota <dirname>...<dirname>] [-restoreFailedStorage true|false|check] [-help [cmd]]>>> *-----------------+-----------------------------------------------------------+ || COMMAND_OPTION || Description +*-----------------+-----------------------------------------------------------+ | -report | Reports basic filesystem information and statistics. *-----------------+-----------------------------------------------------------+ | -safemode enter / leave / get / wait | Safe mode maintenance command. Safe @@ -403,6 +404,10 @@ Administration Commands | 2. user is not an administrator. It does not fault if the | directory has no quota. *-----------------+-----------------------------------------------------------+ +| -restoreFailedStorage true / false / check | This option will turn on/off automatic attempt to restore failed storage replicas. + | If a failed storage becomes available again the system will attempt to restore + | edits and/or fsimage during checkpoint. 'check' option will return current setting. +*-----------------+-----------------------------------------------------------+ | -help [cmd] | Displays help for the given command or all commands if none | is specified. *-----------------+-----------------------------------------------------------+ Propchange: hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/test/core/ ------------------------------------------------------------------------------ Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/core:r1444435-1446504 Modified: hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/TestSortedMapWritable.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/TestSortedMapWritable.java?rev=1446507&r1=1446506&r2=1446507&view=diff ============================================================================== --- hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/TestSortedMapWritable.java (original) +++ hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/TestSortedMapWritable.java Fri Feb 15 10:57:34 2013 @@ -164,4 +164,18 @@ public class TestSortedMapWritable { assertTrue(failureReason, !mapA.equals(mapB)); assertTrue(failureReason, !mapB.equals(mapA)); } + + @Test(timeout = 1000) + public void testPutAll() { + SortedMapWritable map1 = new SortedMapWritable(); + SortedMapWritable map2 = new SortedMapWritable(); + map1.put(new Text("key"), new Text("value")); + map2.putAll(map1); + + assertEquals("map1 entries don't match map2 entries", map1, map2); + assertTrue( + "map2 doesn't have class information from map1", + map2.classToIdMap.containsKey(Text.class) + && map2.idToClassMap.containsValue(Text.class)); + } }