You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by sz...@apache.org on 2012/02/02 00:24:19 UTC
svn commit: r1239398 - in /hadoop/common/branches/branch-0.23-PB: ./
hadoop-client/ hadoop-dist/ hadoop-minicluster/ hadoop-project/
hadoop-project/src/site/ hadoop-tools/ hadoop-tools/hadoop-archives/
hadoop-tools/hadoop-distcp/ hadoop-tools/hadoop-ex...
Author: szetszwo
Date: Wed Feb 1 23:24:15 2012
New Revision: 1239398
URL: http://svn.apache.org/viewvc?rev=1239398&view=rev
Log:
Merge r1237584 through r1239397 from 0.23.
Added:
hadoop/common/branches/branch-0.23-PB/hadoop-client/ (props changed)
- copied from r1239397, hadoop/common/branches/branch-0.23/hadoop-client/
hadoop/common/branches/branch-0.23-PB/hadoop-client/pom.xml
- copied unchanged from r1239397, hadoop/common/branches/branch-0.23/hadoop-client/pom.xml
hadoop/common/branches/branch-0.23-PB/hadoop-minicluster/ (props changed)
- copied from r1239397, hadoop/common/branches/branch-0.23/hadoop-minicluster/
hadoop/common/branches/branch-0.23-PB/hadoop-minicluster/pom.xml
- copied unchanged from r1239397, hadoop/common/branches/branch-0.23/hadoop-minicluster/pom.xml
Modified:
hadoop/common/branches/branch-0.23-PB/ (props changed)
hadoop/common/branches/branch-0.23-PB/hadoop-dist/ (props changed)
hadoop/common/branches/branch-0.23-PB/hadoop-project/ (props changed)
hadoop/common/branches/branch-0.23-PB/hadoop-project/pom.xml
hadoop/common/branches/branch-0.23-PB/hadoop-project/src/site/ (props changed)
hadoop/common/branches/branch-0.23-PB/hadoop-tools/ (props changed)
hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-archives/ (props changed)
hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-distcp/ (props changed)
hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-extras/ (props changed)
hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-rumen/ (props changed)
hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-streaming/pom.xml
hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestStreamingBadRecords.java
hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestUlimit.java
hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-tools-dist/ (props changed)
hadoop/common/branches/branch-0.23-PB/pom.xml
Propchange: hadoop/common/branches/branch-0.23-PB/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 1 23:24:15 2012
@@ -1,2 +1,2 @@
-/hadoop/common/branches/branch-0.23:1227776-1237583
+/hadoop/common/branches/branch-0.23:1227776-1239397
/hadoop/common/trunk:1161777,1161781,1162188,1162421,1162491,1162499,1162613,1162928,1162954,1162979,1163050,1163069,1163490,1163768,1163852,1163858,1163981,1164255,1164301,1164339,1166009,1166402,1167001,1167383,1167662,1170085,1170379,1170459,1171297,1172916,1173402,1176550,1177487,1177531,1177859,1177864,1182189,1182205,1182214,1189932,1189982,1195575,1196113,1196129,1204114,1204117,1204122,1204124,1204129,1204131,1204177,1204370,1204376,1204388,1205260,1205697,1206786,1206830,1207694,1208153,1208313,1212021,1212062,1212073,1212084,1213537,1213586,1213592-1213593,1213954,1214046,1220510,1221348,1225114,1225192,1225456,1225489,1225591,1226211,1226239,1226350,1227091,1227165,1227423,1227964,1229347,1230398,1231569,1231572,1231627,1231640,1233605,1234555,1235135,1235137,1235956,1236456
Propchange: hadoop/common/branches/branch-0.23-PB/hadoop-client/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Feb 1 23:24:15 2012
@@ -0,0 +1 @@
+target
Propchange: hadoop/common/branches/branch-0.23-PB/hadoop-dist/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Feb 1 23:24:15 2012
@@ -0,0 +1 @@
+target
Propchange: hadoop/common/branches/branch-0.23-PB/hadoop-minicluster/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Feb 1 23:24:15 2012
@@ -0,0 +1 @@
+target
Propchange: hadoop/common/branches/branch-0.23-PB/hadoop-project/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 1 23:24:15 2012
@@ -1,2 +1,2 @@
-/hadoop/common/branches/branch-0.23/hadoop-project:1227776-1237583
-/hadoop/common/trunk/hadoop-project:1161777,1161781,1162188,1162421,1162491,1162499,1162613,1162928,1162954,1162979,1163050,1163069,1163490,1163768,1163852,1163858,1163981,1164255,1164301,1164339,1166009,1166402,1167001,1167383,1167662,1170085,1170379,1170459,1171297,1172916,1173402,1176550,1177487,1177531,1177859,1177864,1182189,1182205,1182214,1189932,1189982,1195575,1196113,1196129,1204114,1204117,1204122,1204124,1204129,1204131,1204177,1204370,1204376,1204388,1205260,1205697,1206786,1206830,1207694,1208153,1208313,1212021,1212062,1212073,1212084,1213537,1213586,1213592-1213593,1213598,1213954,1214046,1214499,1220510,1221348,1225114,1225192,1225456,1225489,1225591,1226211,1226239,1226350,1227091,1227165,1227423,1227964,1229347,1230398,1231569,1231572,1231627,1231640,1233605,1234555,1235135,1235137,1235956,1236456
+/hadoop/common/branches/branch-0.23/hadoop-project:1227776-1239397
+/hadoop/common/trunk/hadoop-project:1161777,1161781,1162188,1162421,1162491,1162499,1162613,1162928,1162954,1162979,1163050,1163069,1163490,1163768,1163852,1163858,1163981,1164255,1164301,1164339,1166009,1166402,1167001,1167383,1167662,1170085,1170379,1170459,1171297,1172916,1173402,1176550,1177487,1177531,1177859,1177864,1182189,1182205,1182214,1189932,1189982,1195575,1196113,1196129,1204114,1204117,1204122,1204124,1204129,1204131,1204177,1204370,1204376,1204388,1205260,1205697,1206786,1206830,1207694,1208153,1208313,1212021,1212062,1212073,1212084,1213537,1213586,1213592-1213593,1213598,1213954,1214046,1214499,1220510,1221348,1225114,1225192,1225456,1225489,1225591,1226211,1226239,1226350,1227091,1227165,1227423,1227964,1229347,1230398,1231569,1231572,1231627,1231640,1233605,1234555,1235135,1235137,1235956,1236456,1239386
Modified: hadoop/common/branches/branch-0.23-PB/hadoop-project/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23-PB/hadoop-project/pom.xml?rev=1239398&r1=1239397&r2=1239398&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23-PB/hadoop-project/pom.xml (original)
+++ hadoop/common/branches/branch-0.23-PB/hadoop-project/pom.xml Wed Feb 1 23:24:15 2012
@@ -524,7 +524,7 @@
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
- <version>1.7.1</version>
+ <version>1.8.8</version>
</dependency>
<dependency>
<groupId>org.aspectj</groupId>
Propchange: hadoop/common/branches/branch-0.23-PB/hadoop-project/src/site/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 1 23:24:15 2012
@@ -1,2 +1,2 @@
-/hadoop/common/branches/branch-0.23/hadoop-project/src/site:1227776-1237583
+/hadoop/common/branches/branch-0.23/hadoop-project/src/site:1227776-1239397
/hadoop/common/trunk/hadoop-project/src/site:1161777,1161781,1162188,1162421,1162491,1162499,1162613,1162928,1162954,1162979,1163050,1163069,1163490,1163768,1163852,1163858,1163981,1164255,1164301,1164339,1166009,1166402,1167001,1167383,1167662,1170085,1170379,1170459,1171297,1172916,1173402,1176550,1177487,1177531,1177859,1177864,1182189,1182205,1182214,1189932,1189982,1195575,1196113,1196129,1204114,1204117,1204122,1204124,1204129,1204131,1204177,1204370,1204376,1204388,1205260,1205626,1205697,1206786,1206830,1207694,1208153,1208313,1212021,1212062,1212073,1212084,1213537,1213586,1213592-1213593,1213954,1214046,1220510,1221348,1225114,1225192,1225456,1225489,1225591,1226211,1226239,1226350,1227091,1227165,1227423,1227964,1229347,1230398,1231569,1231572,1231627,1231640,1233605,1234555,1235135,1235137,1235956,1236456
Propchange: hadoop/common/branches/branch-0.23-PB/hadoop-tools/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Feb 1 23:24:15 2012
@@ -0,0 +1 @@
+target
Propchange: hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-archives/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Feb 1 23:24:15 2012
@@ -0,0 +1 @@
+target
Propchange: hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-distcp/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Feb 1 23:24:15 2012
@@ -0,0 +1 @@
+target
Propchange: hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-extras/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Feb 1 23:24:15 2012
@@ -0,0 +1 @@
+target
Propchange: hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-rumen/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Feb 1 23:24:15 2012
@@ -0,0 +1 @@
+target
Modified: hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-streaming/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-streaming/pom.xml?rev=1239398&r1=1239397&r2=1239398&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-streaming/pom.xml (original)
+++ hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-streaming/pom.xml Wed Feb 1 23:24:15 2012
@@ -29,7 +29,7 @@
<properties>
<hadoop.log.dir>${project.build.directory}/log</hadoop.log.dir>
- <test.exclude.pattern>%regex[.*(TestStreamingBadRecords|TestStreamingStatus|TestUlimit).*]</test.exclude.pattern>
+ <test.exclude.pattern>%regex[.*(TestStreamingStatus).*]</test.exclude.pattern>
</properties>
<dependencies>
Modified: hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestStreamingBadRecords.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestStreamingBadRecords.java?rev=1239398&r1=1239397&r2=1239398&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestStreamingBadRecords.java (original)
+++ hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestStreamingBadRecords.java Wed Feb 1 23:24:15 2012
@@ -154,6 +154,10 @@ public class TestStreamingBadRecords ext
}
}
+ /*
+ * Disable test as skipping bad records not supported in 0.23
+ */
+ /*
public void testSkip() throws Exception {
JobConf clusterConf = createJobConf();
createInput();
@@ -195,7 +199,12 @@ public class TestStreamingBadRecords ext
//validate that there is no skip directory as it has been set to "none"
assertTrue(SkipBadRecords.getSkipOutputPath(job.jobConf_)==null);
}
+ */
+ /*
+ * Disable test as skipping bad records not supported in 0.23
+ */
+ /*
public void testNarrowDown() throws Exception {
createInput();
JobConf clusterConf = createJobConf();
@@ -231,6 +240,11 @@ public class TestStreamingBadRecords ext
validateOutput(job.running_, true);
assertTrue(SkipBadRecords.getSkipOutputPath(job.jobConf_)!=null);
}
+ */
+
+ public void testNoOp() {
+ // Added to avoid warnings when running this disabled test
+ }
static class App{
boolean isReducer;
Modified: hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestUlimit.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestUlimit.java?rev=1239398&r1=1239397&r2=1239398&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestUlimit.java (original)
+++ hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestUlimit.java Wed Feb 1 23:24:15 2012
@@ -31,6 +31,7 @@ import org.apache.hadoop.mapreduce.MapRe
import org.apache.hadoop.mapreduce.server.jobtracker.JTConfig;
import org.apache.hadoop.util.StringUtils;
+import org.junit.Ignore;
import org.junit.Test;
import static org.junit.Assert.*;
@@ -52,7 +53,6 @@ public class TestUlimit {
private static String SET_MEMORY_LIMIT = "786432"; // 768MB
String[] genArgs(String memLimit) {
- String strJobtracker = JTConfig.JT_IPC_ADDRESS + "=localhost:" + mr.createJobConf().get(JTConfig.JT_IPC_ADDRESS);
String strNamenode = "fs.default.name=" + mr.createJobConf().get("fs.default.name");
return new String[] {
"-input", inputPath.toString(),
@@ -63,7 +63,6 @@ public class TestUlimit {
"-jobconf", MRJobConfig.NUM_MAPS + "=1",
"-jobconf", JobConf.MAPRED_MAP_TASK_ULIMIT + "=" + memLimit,
"-jobconf", strNamenode,
- "-jobconf", strJobtracker,
"-jobconf", "stream.tmpdir=" +
System.getProperty("test.build.data","/tmp"),
"-jobconf", "mapred.jar=" + TestStreaming.STREAMING_JAR,
@@ -79,6 +78,7 @@ public class TestUlimit {
* is expected to be a failure.
*/
@Test
+ @Ignore
public void testCommandLine() {
if (UtilTest.isCygwin()) {
return;
Propchange: hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-tools-dist/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Feb 1 23:24:15 2012
@@ -0,0 +1 @@
+target
Modified: hadoop/common/branches/branch-0.23-PB/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23-PB/pom.xml?rev=1239398&r1=1239397&r2=1239398&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23-PB/pom.xml (original)
+++ hadoop/common/branches/branch-0.23-PB/pom.xml Wed Feb 1 23:24:15 2012
@@ -79,6 +79,8 @@
<module>hadoop-mapreduce-project</module>
<module>hadoop-tools</module>
<module>hadoop-dist</module>
+ <module>hadoop-client</module>
+ <module>hadoop-minicluster</module>
</modules>
<build>