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 vi...@apache.org on 2013/05/22 08:37:01 UTC
svn commit: r1485086 - in
/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common:
dev-support/findbugsExcludeFile.xml
src/main/java/org/apache/hadoop/util/ProgramDriver.java
src/test/java/org/apache/hadoop/test/CoreTestDriver.java
Author: vinodkv
Date: Wed May 22 06:37:01 2013
New Revision: 1485086
URL: http://svn.apache.org/r1485086
Log:
MAPREDUCE-5156. Change hadoop examples ProgramDriver to be able to run 1.x examples jar on top of YARN. This change breaks 0.23.x direct usages of ProgramDriver. Contributed by Zhijie Shen.
svn merge --ignore-ancestry -c 1485085 ../../trunk/
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/dev-support/findbugsExcludeFile.xml
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ProgramDriver.java
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/CoreTestDriver.java
Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/dev-support/findbugsExcludeFile.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/dev-support/findbugsExcludeFile.xml?rev=1485086&r1=1485085&r2=1485086&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/dev-support/findbugsExcludeFile.xml (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/dev-support/findbugsExcludeFile.xml Wed May 22 06:37:01 2013
@@ -100,6 +100,11 @@
<Method name="run" />
<Bug pattern="DM_EXIT" />
</Match>
+ <Match>
+ <Class name="org.apache.hadoop.util.ProgramDriver" />
+ <Method name="driver" />
+ <Bug pattern="DM_EXIT" />
+ </Match>
<!--
We need to cast objects between old and new api objects
-->
Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ProgramDriver.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ProgramDriver.java?rev=1485086&r1=1485085&r2=1485086&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ProgramDriver.java (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ProgramDriver.java Wed May 22 06:37:01 2013
@@ -117,7 +117,7 @@ public class ProgramDriver {
* @throws IllegalArgumentException
* @throws Throwable Anything thrown by the example program's main
*/
- public int driver(String[] args)
+ public int run(String[] args)
throws Throwable
{
// Make sure they gave us a program name.
@@ -144,5 +144,14 @@ public class ProgramDriver {
pgm.invoke(new_args);
return 0;
}
-
+
+ /**
+ * API compatible with Hadoop 1.x
+ */
+ public void driver(String[] argv) throws Throwable {
+ if (run(argv) == -1) {
+ System.exit(-1);
+ }
+ }
+
}
Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/CoreTestDriver.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/CoreTestDriver.java?rev=1485086&r1=1485085&r2=1485086&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/CoreTestDriver.java (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/CoreTestDriver.java Wed May 22 06:37:01 2013
@@ -52,7 +52,7 @@ public class CoreTestDriver {
public void run(String argv[]) {
int exitCode = -1;
try {
- exitCode = pgd.driver(argv);
+ exitCode = pgd.run(argv);
} catch(Throwable e) {
e.printStackTrace();
}