Author: szetszwo
Date: Thu Jul 4 03:16:54 2013
New Revision: 1499630
URL: http://svn.apache.org/r1499630
Log:
svn merge -c 1498144 from branch-2 for MAPREDUCE-5349.
TestClusterMapReduceTestCase and TestJobName fail on Windows in branch-2.
Modified:
hadoop/common/branches/branch-2.1.0-beta/hadoop-mapreduce-project/ (props
changed)
hadoop/common/branches/branch-2.1.0-beta/hadoop-mapreduce-project/CHANGES.txt
(contents, props changed)
hadoop/common/branches/branch-2.1.0-beta/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/MiniMRClientClusterFactory.java
hadoop/common/branches/branch-2.1.0-beta/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/MiniMRCluster.java
Propchange: hadoop/common/branches/branch-2.1.0-beta/hadoop-mapreduce-project/
------------------------------------------------------------------------------
Merged /hadoop/common/branches/branch-2/hadoop-mapreduce-project:r1498144
Modified:
hadoop/common/branches/branch-2.1.0-beta/hadoop-mapreduce-project/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1.0-beta/hadoop-mapreduce-project/CHANGES.txt?rev=1499630&r1=1499629&r2=1499630&view=diff
==============================================================================
---
hadoop/common/branches/branch-2.1.0-beta/hadoop-mapreduce-project/CHANGES.txt
(original)
+++
hadoop/common/branches/branch-2.1.0-beta/hadoop-mapreduce-project/CHANGES.txt
Thu Jul 4 03:16:54 2013
@@ -433,6 +433,9 @@ Release 2.1.0-beta - 2013-07-02
MAPREDUCE-5177. Use common utils FileUtil#setReadable/Writable/Executable
&
FileUtil#canRead/Write/Execute. (Ivan Mitic via suresh)
+ MAPREDUCE-5349. TestClusterMapReduceTestCase and TestJobName fail on
Windows
+ in branch-2. (Chuan Liu via cnauroth)
+
MAPREDUCE-5291. Change MR App to use updated property names in
container-log4j.properties. (Zhijie Shen via sseth)
Propchange:
hadoop/common/branches/branch-2.1.0-beta/hadoop-mapreduce-project/CHANGES.txt
------------------------------------------------------------------------------
Merged
/hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt:r1498144
Modified:
hadoop/common/branches/branch-2.1.0-beta/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/MiniMRClientClusterFactory.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1.0-beta/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/MiniMRClientClusterFactory.java?rev=1499630&r1=1499629&r2=1499630&view=diff
==============================================================================
---
hadoop/common/branches/branch-2.1.0-beta/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/MiniMRClientClusterFactory.java
(original)
+++
hadoop/common/branches/branch-2.1.0-beta/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/MiniMRClientClusterFactory.java
Thu Jul 4 03:16:54 2013
@@ -38,12 +38,11 @@ public class MiniMRClientClusterFactory
public static MiniMRClientCluster create(Class<?> caller, int noOfNMs,
Configuration conf) throws IOException {
- return create(caller, caller.getName(), noOfNMs, conf);
+ return create(caller, caller.getSimpleName(), noOfNMs, conf);
}
-
+
public static MiniMRClientCluster create(Class<?> caller, String identifier,
- int noOfNMs,
- Configuration conf) throws IOException {
+ int noOfNMs, Configuration conf) throws IOException {
if (conf == null) {
conf = new Configuration();
@@ -71,8 +70,8 @@ public class MiniMRClientClusterFactory
fs.setPermission(remoteCallerJar, new FsPermission("744"));
job.addFileToClassPath(remoteCallerJar);
- MiniMRYarnCluster miniMRYarnCluster =
- new MiniMRYarnCluster(identifier, noOfNMs);
+ MiniMRYarnCluster miniMRYarnCluster = new MiniMRYarnCluster(identifier,
+ noOfNMs);
job.getConfiguration().set("minimrclientcluster.caller.name",
identifier);
job.getConfiguration().setInt("minimrclientcluster.nodemanagers.number",
Modified:
hadoop/common/branches/branch-2.1.0-beta/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/MiniMRCluster.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1.0-beta/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/MiniMRCluster.java?rev=1499630&r1=1499629&r2=1499630&view=diff
==============================================================================
---
hadoop/common/branches/branch-2.1.0-beta/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/MiniMRCluster.java
(original)
+++
hadoop/common/branches/branch-2.1.0-beta/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/MiniMRCluster.java
Thu Jul 4 03:16:54 2013
@@ -178,7 +178,7 @@ public class MiniMRCluster {
int numTrackerToExclude, Clock clock) throws IOException {
if (conf == null) conf = new JobConf();
FileSystem.setDefaultUri(conf, namenode);
- String identifier = this.getClass().getName() + "_"
+ String identifier = this.getClass().getSimpleName() + "_"
+ Integer.toString(new Random().nextInt(Integer.MAX_VALUE));
mrClientCluster = MiniMRClientClusterFactory.create(this.getClass(),
identifier, numTaskTrackers, conf);
