Merge -r 709039:709040 from trunk to branch-0.19 to fix HADOOP-4340.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/core/branches/branch-0.19@709041 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -1008,6 +1008,9 @@ Release 0.18.2 - Unreleased
     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

src/core/org/apache/hadoop/util/ProgramDriver.java

@@ -120,7 +120,8 @@ public class ProgramDriver {
       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 @@ public class ProgramDriver {
     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

src/examples/org/apache/hadoop/examples/ExampleDriver.java

@@ -31,6 +31,7 @@ import org.apache.hadoop.util.ProgramDriver;
 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 @@ public class ExampleDriver {
       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);
   }
 }
 	

src/mapred/org/apache/hadoop/mapred/JobShell.java

@@ -65,6 +65,7 @@ public class JobShell extends Configured implements Tool {
   
   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);
   }
 }