You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by ry...@apache.org on 2015/02/02 19:00:17 UTC
oozie git commit: OOZIE-2119 Distcp action fails when -D option in
arguments (ryota)
Repository: oozie
Updated Branches:
refs/heads/master 43d420914 -> d929be9f7
OOZIE-2119 Distcp action fails when -D option in arguments (ryota)
Project: http://git-wip-us.apache.org/repos/asf/oozie/repo
Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/d929be9f
Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/d929be9f
Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/d929be9f
Branch: refs/heads/master
Commit: d929be9f70c040c09553ba5178fffffc7f99931b
Parents: 43d4209
Author: egashira <ry...@yahoo.com>
Authored: Mon Feb 2 09:59:41 2015 -0800
Committer: egashira <ry...@yahoo.com>
Committed: Mon Feb 2 09:59:41 2015 -0800
----------------------------------------------------------------------
.../org/apache/oozie/action/hadoop/TestDistcpMain.java | 13 +++++++++++++
release-log.txt | 1 +
.../org/apache/oozie/action/hadoop/DistcpMain.java | 3 ++-
3 files changed, 16 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oozie/blob/d929be9f/core/src/test/java/org/apache/oozie/action/hadoop/TestDistcpMain.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/oozie/action/hadoop/TestDistcpMain.java b/core/src/test/java/org/apache/oozie/action/hadoop/TestDistcpMain.java
index 84351f1..9581c5f 100644
--- a/core/src/test/java/org/apache/oozie/action/hadoop/TestDistcpMain.java
+++ b/core/src/test/java/org/apache/oozie/action/hadoop/TestDistcpMain.java
@@ -61,6 +61,7 @@ public class TestDistcpMain extends MainTestCase {
// Check normal execution
DistcpMain.main(new String[]{inputDir.toString(), outputDir.toString()});
assertTrue(getFileSystem().exists(outputDir));
+ fs.delete(outputDir,true);
// Check exception handling
try {
@@ -68,6 +69,18 @@ public class TestDistcpMain extends MainTestCase {
} catch(RuntimeException re) {
assertTrue(re.getMessage().indexOf("Returned value from distcp is non-zero") != -1);
}
+
+ // test -D option
+ jobConf.set("mapred.job.queue.name", "non-exist");
+ fs.delete(new Path(getTestCaseDir(), "action.xml"), true);
+ os = new FileOutputStream(actionXml);
+ jobConf.writeXml(os);
+
+ assertFalse(getFileSystem().exists(outputDir));
+ String option = "-Dmapred.job.queue.name=default"; // overwrite queue setting
+ DistcpMain.main(new String[] { option, inputDir.toString(), outputDir.toString() });
+ assertTrue(getFileSystem().exists(outputDir));
+
return null;
}
}
http://git-wip-us.apache.org/repos/asf/oozie/blob/d929be9f/release-log.txt
----------------------------------------------------------------------
diff --git a/release-log.txt b/release-log.txt
index 86a4f8d..3a049a5 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -1,5 +1,6 @@
-- Oozie 4.2.0 release (trunk - unreleased)
+OOZIE-2119 Distcp action fails when -D option in arguments (ryota)
OOZIE-2112 Child Job URL doesn't show properly with Hive on Tez (ryota)
OOZIE-2122 fix test case failure of TestLiteWorkflowAppService (ryota)
OOZIE-2055 PauseTransitService does not proceed forward if any job has issue (puru)
http://git-wip-us.apache.org/repos/asf/oozie/blob/d929be9f/sharelib/distcp/src/main/java/org/apache/oozie/action/hadoop/DistcpMain.java
----------------------------------------------------------------------
diff --git a/sharelib/distcp/src/main/java/org/apache/oozie/action/hadoop/DistcpMain.java b/sharelib/distcp/src/main/java/org/apache/oozie/action/hadoop/DistcpMain.java
index 67b445e..325798f 100644
--- a/sharelib/distcp/src/main/java/org/apache/oozie/action/hadoop/DistcpMain.java
+++ b/sharelib/distcp/src/main/java/org/apache/oozie/action/hadoop/DistcpMain.java
@@ -23,6 +23,7 @@ import java.lang.reflect.InvocationTargetException;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.util.Tool;
+import org.apache.hadoop.util.ToolRunner;
public class DistcpMain extends JavaMain {
@@ -60,7 +61,7 @@ public class DistcpMain extends JavaMain {
}
try {
Tool distcp = (Tool) construct.newInstance(constArgs);
- int i = distcp.run(args);
+ int i = ToolRunner.run(distcp, args);
if (i != 0) {
throw new RuntimeException("Returned value from distcp is non-zero (" + i + ")");
}