You are viewing a plain text version of this content. The canonical link for it is here.
Posted to mapreduce-commits@hadoop.apache.org by om...@apache.org on 2009/11/13 18:39:36 UTC
svn commit: r835935 - in /hadoop/mapreduce/branches/HDFS-641: ./ conf/
src/c++/ src/c++/libhdfs/ src/contrib/ src/contrib/capacity-scheduler/
src/contrib/data_join/ src/contrib/dynamic-scheduler/
src/contrib/eclipse-plugin/ src/contrib/fairscheduler/ s...
Author: omalley
Date: Fri Nov 13 17:39:35 2009
New Revision: 835935
URL: http://svn.apache.org/viewvc?rev=835935&view=rev
Log:
Catching up to trunk
Modified:
hadoop/mapreduce/branches/HDFS-641/ (props changed)
hadoop/mapreduce/branches/HDFS-641/.gitignore (props changed)
hadoop/mapreduce/branches/HDFS-641/CHANGES.txt
hadoop/mapreduce/branches/HDFS-641/conf/ (props changed)
hadoop/mapreduce/branches/HDFS-641/conf/capacity-scheduler.xml.template (props changed)
hadoop/mapreduce/branches/HDFS-641/src/c++/ (props changed)
hadoop/mapreduce/branches/HDFS-641/src/c++/libhdfs/ (props changed)
hadoop/mapreduce/branches/HDFS-641/src/contrib/ (props changed)
hadoop/mapreduce/branches/HDFS-641/src/contrib/build-contrib.xml (props changed)
hadoop/mapreduce/branches/HDFS-641/src/contrib/build.xml (props changed)
hadoop/mapreduce/branches/HDFS-641/src/contrib/capacity-scheduler/ (props changed)
hadoop/mapreduce/branches/HDFS-641/src/contrib/data_join/ (props changed)
hadoop/mapreduce/branches/HDFS-641/src/contrib/dynamic-scheduler/ (props changed)
hadoop/mapreduce/branches/HDFS-641/src/contrib/eclipse-plugin/ (props changed)
hadoop/mapreduce/branches/HDFS-641/src/contrib/fairscheduler/ (props changed)
hadoop/mapreduce/branches/HDFS-641/src/contrib/index/ (props changed)
hadoop/mapreduce/branches/HDFS-641/src/contrib/mrunit/ (props changed)
hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/ (props changed)
hadoop/mapreduce/branches/HDFS-641/src/contrib/streaming/ (props changed)
hadoop/mapreduce/branches/HDFS-641/src/contrib/streaming/src/java/org/apache/hadoop/streaming/StreamJob.java
hadoop/mapreduce/branches/HDFS-641/src/contrib/vaidya/ (props changed)
hadoop/mapreduce/branches/HDFS-641/src/examples/ (props changed)
hadoop/mapreduce/branches/HDFS-641/src/java/ (props changed)
hadoop/mapreduce/branches/HDFS-641/src/test/mapred/ (props changed)
hadoop/mapreduce/branches/HDFS-641/src/webapps/job/ (props changed)
Propchange: hadoop/mapreduce/branches/HDFS-641/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 13 17:39:35 2009
@@ -1,2 +1,2 @@
/hadoop/core/branches/branch-0.19/mapred:713112
-/hadoop/mapreduce/trunk:817878-834555
+/hadoop/mapreduce/trunk:817878-835934
Propchange: hadoop/mapreduce/branches/HDFS-641/.gitignore
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 13 17:39:35 2009
@@ -1,4 +1,4 @@
/hadoop/core/branches/HADOOP-4687/mapred/.gitignore:776175-784965
/hadoop/core/branches/branch-0.19/mapred/.gitignore:713112
/hadoop/core/trunk/.gitignore:784664-785643
-/hadoop/mapreduce/trunk/.gitignore:817878-834555
+/hadoop/mapreduce/trunk/.gitignore:817878-835934
Modified: hadoop/mapreduce/branches/HDFS-641/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/HDFS-641/CHANGES.txt?rev=835935&r1=835934&r2=835935&view=diff
==============================================================================
--- hadoop/mapreduce/branches/HDFS-641/CHANGES.txt (original)
+++ hadoop/mapreduce/branches/HDFS-641/CHANGES.txt Fri Nov 13 17:39:35 2009
@@ -877,3 +877,6 @@
MAPREDUCE-1178. Fix ClassCastException in MultipleInputs by adding
a DelegatingRecordReader. (Amareshwari Sriramadasu and Jay Booth
via sharad)
+
+ MAPREDUCE-1068. Fix streaming job to show proper message if file is
+ is not present. (Amareshwari Sriramadasu via sharad)
Propchange: hadoop/mapreduce/branches/HDFS-641/conf/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 13 17:39:35 2009
@@ -1,3 +1,3 @@
/hadoop/core/branches/branch-0.19/mapred/conf:713112
/hadoop/core/trunk/conf:784664-785643
-/hadoop/mapreduce/trunk/conf:817878-834555
+/hadoop/mapreduce/trunk/conf:817878-835934
Propchange: hadoop/mapreduce/branches/HDFS-641/conf/capacity-scheduler.xml.template
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 13 17:39:35 2009
@@ -1,3 +1,3 @@
/hadoop/core/branches/branch-0.19/mapred/conf/capacity-scheduler.xml.template:713112
/hadoop/core/trunk/conf/capacity-scheduler.xml.template:776175-785643
-/hadoop/mapreduce/trunk/conf/capacity-scheduler.xml.template:817878-834555
+/hadoop/mapreduce/trunk/conf/capacity-scheduler.xml.template:817878-835934
Propchange: hadoop/mapreduce/branches/HDFS-641/src/c++/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 13 17:39:35 2009
@@ -1,3 +1,3 @@
/hadoop/core/branches/branch-0.19/mapred/src/c++:713112
/hadoop/core/trunk/src/c++:776175-784663
-/hadoop/mapreduce/trunk/src/c++:817878-834555
+/hadoop/mapreduce/trunk/src/c++:817878-835934
Propchange: hadoop/mapreduce/branches/HDFS-641/src/c++/libhdfs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 13 17:39:35 2009
@@ -0,0 +1 @@
+/hadoop/core/branches/HADOOP-4687/mapred/src/c++/libhdfs:776175-776182
Propchange: hadoop/mapreduce/branches/HDFS-641/src/contrib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 13 17:39:35 2009
@@ -1,3 +1,3 @@
/hadoop/core/branches/branch-0.19/mapred/src/contrib:713112
/hadoop/core/trunk/src/contrib:784664-785643
-/hadoop/mapreduce/trunk/src/contrib:817878-834555
+/hadoop/mapreduce/trunk/src/contrib:817878-835934
Propchange: hadoop/mapreduce/branches/HDFS-641/src/contrib/build-contrib.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 13 17:39:35 2009
@@ -1,3 +1,3 @@
/hadoop/core/branches/branch-0.19/mapred/src/contrib/build-contrib.xml:713112
/hadoop/core/trunk/src/contrib/build-contrib.xml:776175-786373
-/hadoop/mapreduce/trunk/src/contrib/build-contrib.xml:817878-834555
+/hadoop/mapreduce/trunk/src/contrib/build-contrib.xml:817878-835934
Propchange: hadoop/mapreduce/branches/HDFS-641/src/contrib/build.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 13 17:39:35 2009
@@ -1,3 +1,3 @@
/hadoop/core/branches/branch-0.19/mapred/src/contrib/build.xml:713112
/hadoop/core/trunk/src/contrib/build.xml:776175-786373
-/hadoop/mapreduce/trunk/src/contrib/build.xml:817878-834555
+/hadoop/mapreduce/trunk/src/contrib/build.xml:817878-835934
Propchange: hadoop/mapreduce/branches/HDFS-641/src/contrib/capacity-scheduler/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 13 17:39:35 2009
@@ -1,3 +1,3 @@
/hadoop/core/branches/branch-0.19/mapred/src/contrib/capacity-scheduler:713112
/hadoop/core/trunk/src/contrib/capacity-scheduler:776175-786373
-/hadoop/mapreduce/trunk/src/contrib/capacity-scheduler:817878-834555
+/hadoop/mapreduce/trunk/src/contrib/capacity-scheduler:817878-835934
Propchange: hadoop/mapreduce/branches/HDFS-641/src/contrib/data_join/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 13 17:39:35 2009
@@ -1,3 +1,3 @@
/hadoop/core/branches/branch-0.19/mapred/src/contrib/data_join:713112
/hadoop/core/trunk/src/contrib/data_join:776175-786373
-/hadoop/mapreduce/trunk/src/contrib/data_join:817878-834555
+/hadoop/mapreduce/trunk/src/contrib/data_join:817878-835934
Propchange: hadoop/mapreduce/branches/HDFS-641/src/contrib/dynamic-scheduler/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 13 17:39:35 2009
@@ -1,3 +1,3 @@
/hadoop/core/branches/branch-0.19/src/contrib/dynamic-scheduler:713112
/hadoop/core/trunk/src/contrib/dynamic-scheduler:784975-786373
-/hadoop/mapreduce/trunk/src/contrib/dynamic-scheduler:817878-834555
+/hadoop/mapreduce/trunk/src/contrib/dynamic-scheduler:817878-835934
Propchange: hadoop/mapreduce/branches/HDFS-641/src/contrib/eclipse-plugin/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 13 17:39:35 2009
@@ -1,3 +1,3 @@
/hadoop/core/branches/branch-0.19/core/src/contrib/eclipse-plugin:713112
/hadoop/core/trunk/src/contrib/eclipse-plugin:776175-784663
-/hadoop/mapreduce/trunk/src/contrib/eclipse-plugin:817878-834555
+/hadoop/mapreduce/trunk/src/contrib/eclipse-plugin:817878-835934
Propchange: hadoop/mapreduce/branches/HDFS-641/src/contrib/fairscheduler/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 13 17:39:35 2009
@@ -1,3 +1,3 @@
/hadoop/core/branches/branch-0.19/mapred/src/contrib/fairscheduler:713112
/hadoop/core/trunk/src/contrib/fairscheduler:776175-786373
-/hadoop/mapreduce/trunk/src/contrib/fairscheduler:817878-834555
+/hadoop/mapreduce/trunk/src/contrib/fairscheduler:817878-835934
Propchange: hadoop/mapreduce/branches/HDFS-641/src/contrib/index/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 13 17:39:35 2009
@@ -1,3 +1,3 @@
/hadoop/core/branches/branch-0.19/mapred/src/contrib/index:713112
/hadoop/core/trunk/src/contrib/index:776175-786373
-/hadoop/mapreduce/trunk/src/contrib/index:817878-834555
+/hadoop/mapreduce/trunk/src/contrib/index:817878-835934
Propchange: hadoop/mapreduce/branches/HDFS-641/src/contrib/mrunit/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 13 17:39:35 2009
@@ -1,3 +1,3 @@
/hadoop/core/branches/branch-0.19/mapred/src/contrib/mrunit:713112
/hadoop/core/trunk/src/contrib/mrunit:776175-786373
-/hadoop/mapreduce/trunk/src/contrib/mrunit:817878-834555
+/hadoop/mapreduce/trunk/src/contrib/mrunit:817878-835934
Propchange: hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 13 17:39:35 2009
@@ -1,3 +1,3 @@
/hadoop/core/branches/branch-0.19/src/contrib/sqoop:713112
/hadoop/core/trunk/src/contrib/sqoop:784975-786373
-/hadoop/mapreduce/trunk/src/contrib/sqoop:817878-834555
+/hadoop/mapreduce/trunk/src/contrib/sqoop:817878-835934
Propchange: hadoop/mapreduce/branches/HDFS-641/src/contrib/streaming/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 13 17:39:35 2009
@@ -1,3 +1,3 @@
/hadoop/core/branches/branch-0.19/mapred/src/contrib/streaming:713112
/hadoop/core/trunk/src/contrib/streaming:776175-786373
-/hadoop/mapreduce/trunk/src/contrib/streaming:817878-834555
+/hadoop/mapreduce/trunk/src/contrib/streaming:817878-835934
Modified: hadoop/mapreduce/branches/HDFS-641/src/contrib/streaming/src/java/org/apache/hadoop/streaming/StreamJob.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/HDFS-641/src/contrib/streaming/src/java/org/apache/hadoop/streaming/StreamJob.java?rev=835935&r1=835934&r2=835935&view=diff
==============================================================================
--- hadoop/mapreduce/branches/HDFS-641/src/contrib/streaming/src/java/org/apache/hadoop/streaming/StreamJob.java (original)
+++ hadoop/mapreduce/branches/HDFS-641/src/contrib/streaming/src/java/org/apache/hadoop/streaming/StreamJob.java Fri Nov 13 17:39:35 2009
@@ -126,6 +126,8 @@
return submitAndMonitorJob();
}catch (IllegalArgumentException ex) {
//ignore, since log will already be printed
+ // print the log in debug mode.
+ LOG.debug("Error in streaming job", ex);
return 1;
}
}
@@ -351,13 +353,13 @@
return OptionBuilder.withDescription(desc).create(name);
}
- private static void validate(final List<String> values)
+ private void validate(final List<String> values)
throws IllegalArgumentException {
for (String file : values) {
File f = new File(file);
if (!f.canRead()) {
- throw new IllegalArgumentException("File : " + f.getAbsolutePath()
- + " is not readable.");
+ fail("File: " + f.getAbsolutePath()
+ + " does not exist, or is not readable.");
}
}
}
Propchange: hadoop/mapreduce/branches/HDFS-641/src/contrib/vaidya/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 13 17:39:35 2009
@@ -1,3 +1,3 @@
/hadoop/core/branches/branch-0.19/mapred/src/contrib/vaidya:713112
/hadoop/core/trunk/src/contrib/vaidya:776175-786373
-/hadoop/mapreduce/trunk/src/contrib/vaidya:817878-834555
+/hadoop/mapreduce/trunk/src/contrib/vaidya:817878-835934
Propchange: hadoop/mapreduce/branches/HDFS-641/src/examples/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 13 17:39:35 2009
@@ -1,3 +1,3 @@
/hadoop/core/branches/branch-0.19/mapred/src/examples:713112
/hadoop/core/trunk/src/examples:776175-784663
-/hadoop/mapreduce/trunk/src/examples:817878-834555
+/hadoop/mapreduce/trunk/src/examples:817878-835934
Propchange: hadoop/mapreduce/branches/HDFS-641/src/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 13 17:39:35 2009
@@ -1,3 +1,3 @@
/hadoop/core/branches/branch-0.19/mapred/src/java:713112
/hadoop/core/trunk/src/mapred:776175-785643
-/hadoop/mapreduce/trunk/src/java:817878-834555
+/hadoop/mapreduce/trunk/src/java:817878-835934
Propchange: hadoop/mapreduce/branches/HDFS-641/src/test/mapred/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 13 17:39:35 2009
@@ -1,3 +1,3 @@
/hadoop/core/branches/branch-0.19/mapred/src/test/mapred:713112
/hadoop/core/trunk/src/test/mapred:776175-785643
-/hadoop/mapreduce/trunk/src/test/mapred:817878-834555
+/hadoop/mapreduce/trunk/src/test/mapred:817878-835934
Propchange: hadoop/mapreduce/branches/HDFS-641/src/webapps/job/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 13 17:39:35 2009
@@ -1,3 +1,3 @@
/hadoop/core/branches/branch-0.19/mapred/src/webapps/job:713112
/hadoop/core/trunk/src/webapps/job:776175-785643
-/hadoop/mapreduce/trunk/src/webapps/job:817878-834555
+/hadoop/mapreduce/trunk/src/webapps/job:817878-835934