Catching up to trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/mapreduce/branches/HDFS-641@835935 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/CHANGES.txt b/CHANGES.txt
index 0341670..7672376 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -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)
diff --git a/src/contrib/streaming/src/java/org/apache/hadoop/streaming/StreamJob.java b/src/contrib/streaming/src/java/org/apache/hadoop/streaming/StreamJob.java
index 261bdeb..f3544a0 100644
--- a/src/contrib/streaming/src/java/org/apache/hadoop/streaming/StreamJob.java
+++ b/src/contrib/streaming/src/java/org/apache/hadoop/streaming/StreamJob.java
@@ -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.");
}
}
}
