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 ac...@apache.org on 2008/10/30 00:07:56 UTC
svn commit: r709040 - in /hadoop/core/trunk: CHANGES.txt
src/core/org/apache/hadoop/util/ProgramDriver.java
src/examples/org/apache/hadoop/examples/ExampleDriver.java
src/mapred/org/apache/hadoop/mapred/JobShell.java
Author: acmurthy
Date: Wed Oct 29 16:07:55 2008
New Revision: 709040
URL: http://svn.apache.org/viewvc?rev=709040&view=rev
Log:
HADOOP-4340. Correctly set the exit code from JobShell.main so that the 'hadoop jar' command returns the right code to the user.
Modified:
hadoop/core/trunk/CHANGES.txt
hadoop/core/trunk/src/core/org/apache/hadoop/util/ProgramDriver.java
hadoop/core/trunk/src/examples/org/apache/hadoop/examples/ExampleDriver.java
hadoop/core/trunk/src/mapred/org/apache/hadoop/mapred/JobShell.java
Modified: hadoop/core/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/CHANGES.txt?rev=709040&r1=709039&r2=709040&view=diff
==============================================================================
--- hadoop/core/trunk/CHANGES.txt (original)
+++ hadoop/core/trunk/CHANGES.txt Wed Oct 29 16:07:55 2008
@@ -1088,6 +1088,9 @@
HADOOP-4483 Honor the max parameter in DatanodeDescriptor.getBlockArray(..)
(Ahad Rana and Hairong Kuang via szetszwo)
+ HADOOP-4340. Correctly set the exit code from JobShell.main so that the
+ 'hadoop jar' command returns the right code to the user. (acmurthy)
+
NEW FEATURES
HADOOP-2421. Add jdiff output to documentation, listing all API
Modified: hadoop/core/trunk/src/core/org/apache/hadoop/util/ProgramDriver.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/core/org/apache/hadoop/util/ProgramDriver.java?rev=709040&r1=709039&r2=709040&view=diff
==============================================================================
--- hadoop/core/trunk/src/core/org/apache/hadoop/util/ProgramDriver.java (original)
+++ hadoop/core/trunk/src/core/org/apache/hadoop/util/ProgramDriver.java Wed Oct 29 16:07:55 2008
@@ -120,7 +120,8 @@
System.out.println("An example program must be given as the" +
" first argument.");
printUsage(programs);
- return;
+ throw new IllegalArgumentException("An example program must be given " +
+ "as the first argument.");
}
// And that it is good.
@@ -128,7 +129,8 @@
if (pgm == null) {
System.out.println("Unknown program '" + args[0] + "' chosen.");
printUsage(programs);
- return;
+ throw new IllegalArgumentException("Unknown program '" + args[0] +
+ "' chosen.");
}
// Remove the leading argument and call main
Modified: hadoop/core/trunk/src/examples/org/apache/hadoop/examples/ExampleDriver.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/examples/org/apache/hadoop/examples/ExampleDriver.java?rev=709040&r1=709039&r2=709040&view=diff
==============================================================================
--- hadoop/core/trunk/src/examples/org/apache/hadoop/examples/ExampleDriver.java (original)
+++ hadoop/core/trunk/src/examples/org/apache/hadoop/examples/ExampleDriver.java Wed Oct 29 16:07:55 2008
@@ -31,6 +31,7 @@
public class ExampleDriver {
public static void main(String argv[]){
+ int exitCode = -1;
ProgramDriver pgd = new ProgramDriver();
try {
pgd.addClass("wordcount", WordCount.class,
@@ -58,10 +59,15 @@
pgd.addClass("terasort", TeraSort.class, "Run the terasort");
pgd.addClass("teravalidate", TeraValidate.class, "Checking results of terasort");
pgd.driver(argv);
+
+ // Success
+ exitCode = 0;
}
catch(Throwable e){
e.printStackTrace();
}
+
+ System.exit(exitCode);
}
}
Modified: hadoop/core/trunk/src/mapred/org/apache/hadoop/mapred/JobShell.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/mapred/org/apache/hadoop/mapred/JobShell.java?rev=709040&r1=709039&r2=709040&view=diff
==============================================================================
--- hadoop/core/trunk/src/mapred/org/apache/hadoop/mapred/JobShell.java (original)
+++ hadoop/core/trunk/src/mapred/org/apache/hadoop/mapred/JobShell.java Wed Oct 29 16:07:55 2008
@@ -65,6 +65,7 @@
public static void main(String[] argv) throws Exception {
JobShell jshell = new JobShell();
- ToolRunner.run(jshell, argv);
+ int status = ToolRunner.run(jshell, argv);
+ System.exit(status);
}
}